Migrate to Laravel 6

Author: AlShahawi

.editorconfig

@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2

.env.example

@@ -11,9 +11,9 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

.gitignore

@@ -10,12 +10,12 @@
 /docs/api/build
 /docs/api/_cache
 /.env
+.env.backup
 /.phpunit.result.cache
 /Homestead.json
 /Homestead.yaml
 /npm-debug.log
 /yarn-error.log
-
 *~
 /.phpstorm.meta.php
 /_ide_helper.php

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/laravel/compare/v5.8.3...master)
+## [Unreleased](https://github.com/laravel/laravel/compare/v5.8.3...develop)
+
+### Changed
+- Require PHP 7.2 ([25cf4c4](https://github.com/laravel/laravel/commit/25cf4c492308b9c5148f9522d8dd8f8f18819f50))
+- Encourage to use PHPUnit 8 ([0582a20](https://github.com/laravel/laravel/commit/0582a20adddc0e6bd16ca05eeae93e6412924ad6))
 
 
 ## [v5.8.16 (2019-05-07)](https://github.com/laravel/laravel/compare/v5.8.3...master)

app/Http/Kernel.php

@@ -14,11 +14,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -73,6 +73,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

app/Support/helpers.php

@@ -1,30 +1,15 @@
 <?php
 
-if (! function_exists('filter_html')) {
+if (! function_exists('helper_function')) {
     /**
-     * Remove dangerous tags (with attributes) from html.
+     * Example of a helper function.
      *
-     * @param  string $html
+     * @param  $paramaters
      *
      * @return string
      */
-    function filter_html($html, $defaultAllowed = null)
+    function helper_function($paramaters)
     {
-        if (! $defaultAllowed) {
-            $defaultAllowed = 'div,img[src],a[href|title],blockquote[cite],h1,h2,h3,h4,h5,b,i,tt,hr,strong,span,s,p,code,pre,em,ul,ol,li,table,thead,tbody,tr,td,th,br,*[style|class]';
-        }
-
-        $config = HTMLPurifier_Config::createDefault();
-        $config->set('Core.Encoding', 'UTF-8');
-        $allowed = config('editor.allowed_tags', $defaultAllowed);
-
-        // put here every tag and attribute that you want to pass through
-        //            $config->set('HTML.AllowedAttributes', '*.style');
-        $config->set('HTML.Allowed', $allowed);
-
-        $purifier = new HTMLPurifier($config);
-
-        // return the filtered elements.
-        return $purifier->purify($html);
+        //
     }
 }

composer.json

@@ -8,23 +8,20 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
-        "barryvdh/laravel-debugbar": "^3.2",
-        "barryvdh/laravel-ide-helper": "^2.5",
-        "ezyang/htmlpurifier": "^4.10",
+        "php": "^7.2",
         "fideloper/proxy": "^4.0",
+        "laravel/framework": "^6.0",
         "friendsofphp/php-cs-fixer": "^2.14",
-        "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
-        "doctrine/dbal": "^2.9",
-        "filp/whoops": "^2.0",
+        "facade/ignition": "^1.4",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.0",
+        "barryvdh/laravel-ide-helper": "^2.6",
+        "barryvdh/laravel-debugbar": "^3.2"
     },
     "config": {
         "optimize-autoloader": true,
@@ -60,15 +57,14 @@
         "php-cs:fix": "vendor/bin/php-cs-fixer fix",
         "app:clear": "php artisan clear-compiled && php artisan cache:clear && php artisan config:clear && php artisan debugbar:clear && php artisan route:clear && php artisan view:clear",
         "auto-complete:generate": [
-            "php artisan ide-helper:meta",
-            "php artisan ide-helper:generate",
-            "php artisan ide-helper:models --nowrite"
+            "@php artisan ide-helper:meta",
+            "@php artisan ide-helper:generate",
+            "@php artisan ide-helper:models --nowrite"
         ],
-        "api:generate": "php sami.phar update docs/api/config.php",
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan ide-helper:generate",
-            "@php artisan ide-helper:meta",
+            "@php artisan ide-helper:generate || true",
+            "@php artisan ide-helper:meta || true",
             "@php artisan package:discover --ansi"
         ],
         "post-root-package-install": [

config/broadcasting.php

@@ -37,7 +37,7 @@
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
+                'useTLS' => true,
             ],
         ],
 

config/cache.php

@@ -82,6 +82,7 @@
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
             'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
     ],

config/database.php

@@ -119,21 +119,23 @@
 
     'redis' => [
 
-        'client' => env('REDIS_CLIENT', 'predis'),
+        'client' => env('REDIS_CLIENT', 'phpredis'),
 
         'options' => [
-            'cluster' => env('REDIS_CLUSTER', 'predis'),
-            'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
+            'cluster' => env('REDIS_CLUSTER', 'redis'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
         ],
 
         'default' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DB', 0),
         ],
 
         'cache' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),