Laravel 5 to 6

.env

@@ -1,4 +1,4 @@
-\APP_NAME=Unioil
+APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=base64:0gU9IIArwNb9IW4nkiuN72zGhw0YrtIVZnM7WJxxD88=
 APP_DEBUG=true
@@ -10,8 +10,8 @@ DB_CONNECTION=mysql
 DB_HOST=db_mysql
 DB_PORT=3306
 DB_DATABASE=unioil-app
-DB_USERNAME=armiejean
+DB_USERNAME=rootuser
-DB_PASSWORD=yourpassword
+DB_PASSWORD=password
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

app/Http/Resources/MpinFormValidation.php

@@ -1,6 +1,7 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Resources;
+
 
 use Response;
 use Illuminate\Http\Request;

composer.json

@@ -9,7 +9,7 @@
         "barryvdh/laravel-cors": "^0.11.2",
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.7.*",
+        "laravel/framework": "^6.20",
         "laravel/passport": "^7.0",
         "laravel/tinker": "^1.0",
         "league/flysystem-aws-s3-v3": "^1.0",

config/cache.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Str;
 return [
 
     /*
@@ -88,7 +89,7 @@ return [
 
     'prefix' => env(
         'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'
     ),
 
 ];

config/database.php

@@ -44,8 +44,8 @@ return [
             'host' => env('DB_HOST', 'db_mysql'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'unioil-app'),
-            'username' => env('DB_USERNAME', 'armiejean'),
+            'username' => env('DB_USERNAME', 'rootuser'),
-            'password' => env('DB_PASSWORD', 'yourpassword'),
+            'password' => env('DB_PASSWORD', 'password'),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',

config/session.php

@@ -1,5 +1,5 @@
 <?php
-
+use Illuminate\Support\Str;
 return [
 
     /*
@@ -124,7 +124,7 @@ return [
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*

docker-compose.yml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
   # Laravel App
   app:
@@ -9,8 +11,6 @@ services:
     working_dir: /var/www
     volumes:
       - .:/var/www
-      - ./docker/php/storage:/var/www/storage
-      - ./docker/php/bootstrap/cache:/var/www/bootstrap/cache
     depends_on:
       db_mysql:
         condition: service_healthy
@@ -32,20 +32,20 @@ services:
 
   # MySQL
   db_mysql:
-    image: mysql:5.7
+    image: mysql:8.0  
     container_name: db_mysql
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_PASSWORD: newpassword
       MYSQL_DATABASE: unioil-app
-      MYSQL_USER: armiejean
+      MYSQL_USER: rootuser
-      MYSQL_PASSWORD: yourpassword
+      MYSQL_PASSWORD: password
       MYSQL_ALLOW_EMPTY_PASSWORD: "no"
 
     volumes:
       - mysql-data:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-proot"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-pnewpassword"]
       interval: 10s
       timeout: 5s
       retries: 5

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-# Base image
+# Use PHP 7.4 Alpine (compatible with Laravel 6)
 FROM php:7.4-fpm-alpine
 
 # Install required dependencies
@@ -10,7 +10,8 @@ RUN apk add --no-cache \
     freetype-dev \
     libzip-dev \
     zip \
-    unzip
+    unzip \
+    openssl # Laravel 6 requires OpenSSL
 
 # Install required extensions
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \

docker/php/bootstrap/cache/packages.php

@@ -20,13 +20,6 @@
       0 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
     ),
   ),
-  'laravel/nexmo-notification-channel' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Illuminate\\Notifications\\NexmoChannelServiceProvider',
-    ),
-  ),
   'laravel/passport' => 
   array (
     'providers' => 
@@ -34,13 +27,6 @@
       0 => 'Laravel\\Passport\\PassportServiceProvider',
     ),
   ),
-  'laravel/slack-notification-channel' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Illuminate\\Notifications\\SlackChannelServiceProvider',
-    ),
-  ),
   'laravel/tinker' => 
   array (
     'providers' => 
@@ -50,14 +36,14 @@
   ),
   'maatwebsite/excel' => 
   array (
-    'providers' => 
-    array (
-      0 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    ),
     'aliases' => 
     array (
       'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel',
     ),
+    'providers' => 
+    array (
+      0 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    ),
   ),
   'nesbot/carbon' => 
   array (

docker/php/bootstrap/cache/services.php

@@ -26,20 +26,18 @@
     22 => 'Barryvdh\\Cors\\ServiceProvider',
     23 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
     24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    25 => 'Illuminate\\Notifications\\NexmoChannelServiceProvider',
+    25 => 'Laravel\\Passport\\PassportServiceProvider',
-    26 => 'Laravel\\Passport\\PassportServiceProvider',
+    26 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    27 => 'Illuminate\\Notifications\\SlackChannelServiceProvider',
+    27 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    28 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    28 => 'Carbon\\Laravel\\ServiceProvider',
-    29 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    29 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    30 => 'Carbon\\Laravel\\ServiceProvider',
+    30 => 'App\\Providers\\AppServiceProvider',
-    31 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    31 => 'App\\Providers\\AuthServiceProvider',
-    32 => 'App\\Providers\\AppServiceProvider',
+    32 => 'App\\Providers\\EventServiceProvider',
-    33 => 'App\\Providers\\AuthServiceProvider',
+    33 => 'App\\Providers\\RouteServiceProvider',
-    34 => 'App\\Providers\\EventServiceProvider',
+    34 => 'App\\Providers\\CustomPassportServiceProvider',
-    35 => 'App\\Providers\\RouteServiceProvider',
+    35 => 'Laravel\\Passport\\PassportServiceProvider',
-    36 => 'App\\Providers\\CustomPassportServiceProvider',
+    36 => 'Barryvdh\\Cors\\ServiceProvider',
-    37 => 'Laravel\\Passport\\PassportServiceProvider',
-    38 => 'Barryvdh\\Cors\\ServiceProvider',
   ),
   'eager' => 
   array (
@@ -56,11 +54,11 @@
     10 => 'Barryvdh\\Cors\\ServiceProvider',
     11 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
     12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    13 => 'Illuminate\\Notifications\\NexmoChannelServiceProvider',
+    13 => 'Laravel\\Passport\\PassportServiceProvider',
-    14 => 'Laravel\\Passport\\PassportServiceProvider',
+    14 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    15 => 'Illuminate\\Notifications\\SlackChannelServiceProvider',
+    15 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    16 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    16 => 'Carbon\\Laravel\\ServiceProvider',
-    17 => 'Carbon\\Laravel\\ServiceProvider',
+    17 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     18 => 'App\\Providers\\AppServiceProvider',
     19 => 'App\\Providers\\AuthServiceProvider',
     20 => 'App\\Providers\\EventServiceProvider',
@@ -79,6 +77,7 @@
     'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
     'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
     'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider',
     'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
     'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -86,16 +85,13 @@
     'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.db.wipe' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.event.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.event.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.event.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -117,8 +113,6 @@
     'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.channel.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -131,7 +125,6 @@
     'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -151,6 +144,14 @@
     'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
     'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
@@ -172,8 +173,6 @@
     'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
     'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
     'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
-    'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
-    'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
   ),
   'when' => 
   array (
@@ -213,11 +212,5 @@
     'Illuminate\\Validation\\ValidationServiceProvider' => 
     array (
     ),
-    'Laravel\\Tinker\\TinkerServiceProvider' => 
-    array (
-    ),
-    'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' => 
-    array (
-    ),
   ),
 );

docker/php/storage/framework/sessions/8L7uOXPTTgAESZ3U9t5MkQMQN2TVZl5sQRwwa3oy

@@ -0,0 +1 @@
+a:3:{s:6:"_token";s:40:"0syKFKlwqJGoTYrHWjlWlvN3axI4PZefG9NRHKfd";s:9:"_previous";a:1:{s:3:"url";s:16:"http://localhost";}s:6:"_flash";a:2:{s:3:"old";a:0:{}s:3:"new";a:0:{}}}

docker/php/storage/framework/sessions/Ptvpbn84ocajdQCjU9addN7TTO3FhsxLQ63s7N9p

@@ -0,0 +1 @@
+a:3:{s:6:"_token";s:40:"EPcDXgvbTT8qKgddoDarrwOifxhSP1EU1GeWc2sF";s:9:"_previous";a:1:{s:3:"url";s:16:"http://localhost";}s:6:"_flash";a:2:{s:3:"old";a:0:{}s:3:"new";a:0:{}}}

docker/php/storage/framework/sessions/TXZ5khLO5fpEmAFLz6O0YnBAnuuiAHSwyid4XNgT

@@ -0,0 +1 @@
+a:3:{s:6:"_token";s:40:"Z4fgHW71XT9oeQqB3pm40UzVKnY4SCCQ90zHQvOl";s:9:"_previous";a:1:{s:3:"url";s:16:"http://localhost";}s:6:"_flash";a:2:{s:3:"old";a:0:{}s:3:"new";a:0:{}}}

docker/php/storage/framework/sessions/XygwAu5rlOlHPkMksscYvSJX6DX0k6x00srBncsz

@@ -0,0 +1 @@
+a:3:{s:6:"_token";s:40:"9xH75KiAI41SvNGkh1QZM4JSp2KyZsUR4voQtHve";s:9:"_previous";a:1:{s:3:"url";s:16:"http://localhost";}s:6:"_flash";a:2:{s:3:"old";a:0:{}s:3:"new";a:0:{}}}

docker/php/storage/framework/sessions/etty8uT82feW8NLU1lDEgGRyfVM4qMnEzlWZdW0k

@@ -0,0 +1 @@
+a:3:{s:6:"_token";s:40:"xFcnBhW7WngztJZPzqlogxoGJzt9DuDhJBIPZXTg";s:9:"_previous";a:1:{s:3:"url";s:16:"http://localhost";}s:6:"_flash";a:2:{s:3:"old";a:0:{}s:3:"new";a:0:{}}}

docker/php/storage/framework/views/cfb14c1631a5322002da96a27559413a7fa05a94.php

@@ -0,0 +1,96 @@
+<!doctype html>
+<html lang="<?php echo e(app()->getLocale()); ?>">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>Laravel</title>
+
+        <!-- Fonts -->
+        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
+
+        <!-- Styles -->
+        <style>
+            html, body {
+                background-color: #fff;
+                color: #636b6f;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
+                height: 100vh;
+                margin: 0;
+            }
+
+            .full-height {
+                height: 100vh;
+            }
+
+            .flex-center {
+                align-items: center;
+                display: flex;
+                justify-content: center;
+            }
+
+            .position-ref {
+                position: relative;
+            }
+
+            .top-right {
+                position: absolute;
+                right: 10px;
+                top: 18px;
+            }
+
+            .content {
+                text-align: center;
+            }
+
+            .title {
+                font-size: 84px;
+            }
+
+            .links > a {
+                color: #636b6f;
+                padding: 0 25px;
+                font-size: 12px;
+                font-weight: 600;
+                letter-spacing: .1rem;
+                text-decoration: none;
+                text-transform: uppercase;
+            }
+
+            .m-b-md {
+                margin-bottom: 30px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="flex-center position-ref full-height">
+            <?php if(Route::has('login')): ?>
+                <div class="top-right links">
+                    <?php if(auth()->guard()->check()): ?>
+                        <a href="<?php echo e(url('/home')); ?>">Home</a>
+                    <?php else: ?>
+                        <a href="<?php echo e(route('login')); ?>">Login</a>
+                        <a href="<?php echo e(route('register')); ?>">Register</a>
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
+
+            <div class="content">
+                <div class="title m-b-md">
+                    Laravel
+                </div>
+
+                <div class="links">
+                    <a href="https://laravel.com/docs">Documentation</a>
+                    <a href="https://laracasts.com">Laracasts</a>
+                    <a href="https://laravel-news.com">News</a>
+                    <a href="https://nova.laravel.com">Nova</a>
+                    <a href="https://forge.laravel.com">Forge</a>
+                    <a href="https://github.com/laravel/laravel">GitHub</a>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
+<?php /**PATH /var/www/resources/views/welcome.blade.php ENDPATH**/ ?>