Skip to content

Commit 4e9222e

Browse files
authored
Merge pull request #511 from viralsolani/develop
Upgrade to Laravel 6.0
2 parents eb64611 + a3f1852 commit 4e9222e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+897
-646
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_DEMO=false
2-
APP_NAME="Laravel 5.8 AdminPanel"
2+
APP_NAME="Laravel 6.0 AdminPanel"
33
APP_ENV=local
44
APP_KEY=
55
APP_DEBUG=true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ Start the local development server
9494
php artisan serve
9595

9696

97-
9897
You can now access the server at http://localhost:8000
9998

10099
**Command list**
@@ -154,6 +153,7 @@ Feel free to create any pull requests for the project. For proposing any new cha
154153
(1) Viral Solani - [email protected]
155154
(2) Vipul Basapati - [email protected]
156155
(3) Vallabh Kansagara - [email protected]
156+
(4) Kamlesh Gupta - [email protected]
157157

158158
## License
159159

app/Console/Commands/InstallAppCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Support\Facades\Artisan;
99
use Illuminate\Support\Facades\DB;
1010
use Illuminate\Support\Facades\File;
11+
use Illuminate\Support\Str;
1112
use PDOException;
1213
use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
1314
use Symfony\Component\Console\Question\Question;
@@ -217,7 +218,7 @@ protected function guessDatabaseName()
217218
$segments = array_reverse(explode(DIRECTORY_SEPARATOR, app_path()));
218219
$name = explode('.', $segments[1])[0];
219220

220-
return str_replace('-', '_', str_slug($name));
221+
return str_replace('-', '_', Str::slug($name));
221222
} catch (Exception $e) {
222223
return '';
223224
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
namespace App\Http\Requests\Backend\Notification;
4+
5+
use App\Http\Requests\Request;
6+
7+
/**
8+
* Class MarkNotificationRequest.
9+
*/
10+
class MarkNotificationRequest extends Request
11+
{
12+
/**
13+
* Determine if the user is authorized to make this request.
14+
*
15+
* @return bool
16+
*/
17+
public function authorize()
18+
{
19+
return '';
20+
}
21+
22+
/**
23+
* Get the validation rules that apply to the request.
24+
*
25+
* @return array
26+
*/
27+
public function rules()
28+
{
29+
return [
30+
];
31+
}
32+
}

app/Http/Responses/Backend/Blog/CreateResponse.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
class CreateResponse implements Responsable
88
{
99
protected $status;
10+
1011
protected $blogTags;
12+
1113
protected $blogCategories;
1214

1315
public function __construct($status, $blogCategories, $blogTags)

app/Http/Responses/Backend/Blog/EditResponse.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
class EditResponse implements Responsable
88
{
99
protected $blog;
10+
1011
protected $status;
12+
1113
protected $blogTags;
14+
1215
protected $blogCategories;
1316

1417
public function __construct($blog, $status, $blogCategories, $blogTags)

app/Http/Responses/RedirectResponse.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
class RedirectResponse implements Responsable
88
{
99
protected $route;
10+
1011
protected $message;
1112

1213
public function __construct($route, $message)

app/Http/Utilities/Notification.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
abstract class Notification
1919
{
2020
protected $_message = null;
21+
2122
protected $_devices = null;
23+
2224
protected $_response = null;
25+
2326
protected $_body = null;
27+
2428
protected static $_url = null;
2529

2630
/*

app/Http/Utilities/NotificationIos.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ class NotificationIos extends Notification
77
const BADGE_ID = 0;
88

99
protected $_passPhrase = null; // for authentication of .pem file or password of .pem file
10+
1011
protected $_pemFile = null; // for send notificetion .pem file is must add in that code
12+
1113
protected static $_url = 'ssl://gateway.sandbox.push.apple.com:2195'; // url for send push message
1214

1315
const ERROR_PEM_NOTACCESSIBLE = 1; // exception error for file not get
16+
1417
const ERROR_PASSPHRASE_EMPTY = 2; // exception error for passphrese empty
18+
1519
const ERROR_CONNECTION_FAILED = 3; // exception error for connection failed
1620

1721
protected $sendNotification = 1; // exception error for connection failed

app/Http/Utilities/PushNotification.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ public function _pushNotification($msg, $type, $devicetoken)
2828
return $this->_pushToIos($devicetoken, $msg);
2929

3030
return true;
31+
3132
break;
3233

3334
case 'android':
3435
return $this->_pushToAndroid($devicetoken, $msg);
36+
3537
break;
3638

3739
default:

0 commit comments

Comments
 (0)