laravel framework updated to ^11.0

.env

@@ -1,4 +1,4 @@
-\APP_NAME=Unioil
+APP_NAME=Unioil
 APP_ENV=local
 APP_KEY=base64:0gU9IIArwNb9IW4nkiuN72zGhw0YrtIVZnM7WJxxD88=
 APP_DEBUG=true
@@ -7,11 +7,11 @@ APP_URL=http://localhost
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST="172.31.28.52"
+DB_HOST=db_mysql
 DB_PORT=3306
 DB_DATABASE="unioilLoyaltyApp"
-DB_USERNAME="bindapp"
+DB_USERNAME="admin_erish"
-DB_PASSWORD="hive1234"
+DB_PASSWORD="laravel"
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -32,7 +33,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +45,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/Http/Kernel.php

@@ -19,7 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Barryvdh\Cors\HandleCors::class,
+        // \Barryvdh\Cors\HandleCors::class,
     ];
 
     /**
@@ -41,7 +41,7 @@ class Kernel extends HttpKernel
         'api' => [
             'throttle:60,1',
             'bindings',
-            \Barryvdh\Cors\HandleCors::class,
+            // \Barryvdh\Cors\HandleCors::class,
             \App\Http\Middleware\BeforeMiddleware::class,
         ],
     ];

app/Http/Middleware/TrustProxies.php

@@ -2,22 +2,26 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
-    /**
+        /**
      * The trusted proxies for this application.
      *
      * @var array
      */
-    protected $proxies;
+    protected $proxies = '*';
 
-    /**
+        /**
      * The headers that should be used to detect proxies.
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers = Request::HEADER_X_FORWARDED_FOR
+                        | Request::HEADER_X_FORWARDED_HOST
+                        | Request::HEADER_X_FORWARDED_PORT
+                        | Request::HEADER_X_FORWARDED_PROTO
+                        | Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Resources/MpinFormValidation.php

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

app/Providers/AppServiceProvider.php

@@ -28,7 +28,7 @@ class AppServiceProvider extends ServiceProvider
     {
         Schema::defaultStringLength(128);
         $this->registerPolicies();
-        Passport::routes();
+        // Passport::routes();
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -27,7 +27,7 @@ class AuthServiceProvider extends ServiceProvider
     {
         $this->registerPolicies();
 
-        Passport::routes();
+        // Passport::routes();
 
         Passport::tokensExpireIn(Carbon::now()->addMonths(10));
 

composer.json

@@ -5,25 +5,29 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.1.3",
+        "php": "^8.3.6",
-        "barryvdh/laravel-cors": "^0.11.2",
+        "brick/math": "0.10.2",
-        "fideloper/proxy": "^4.0",
+        "guzzlehttp/guzzle": "^7.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "laravel/framework": "^11.0",
-        "laravel/framework": "5.7.*",
+        "laravel/passport": "*",
-        "laravel/passport": "^7.0",
+        "laravel/tinker": "^2.0",
-        "laravel/tinker": "^1.0",
+        "league/flysystem-aws-s3-v3": "^3.0",
-        "league/flysystem-aws-s3-v3": "^1.0",
         "maatwebsite/excel": "^3.1",
-        "moontoast/math": "^1.1",
+        "ramsey/uuid": "^4.2",
-        "ramsey/uuid": "^3.8"
+        "symfony/console": "^7.0",
+        "symfony/error-handler": "^7.0",
+        "symfony/http-foundation": "^7.0",
+        "symfony/http-kernel": "^7.0",
+        "symfony/routing": "^7.0",
+        "symfony/validator": "^7.0"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
+        "beyondcode/laravel-dump-server": "^2.0",
         "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.4",
+        "fakerphp/faker": "^1.9",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^2.0",
+        "nunomaduro/collision": "^8.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "classmap": [
@@ -39,12 +43,6 @@
             "Tests\\": "tests/"
         }
     },
-    "extra": {
-        "laravel": {
-            "dont-discover": [
-            ]
-        }
-    },
     "scripts": {
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
@@ -60,7 +58,10 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "kylekatarnls/update-helper": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

config/app.php

@@ -172,7 +172,7 @@ return [
         App\Providers\CustomPassportServiceProvider::class,
 
         Laravel\Passport\PassportServiceProvider::class,
-        Barryvdh\Cors\ServiceProvider::class,
+        // Barryvdh\Cors\ServiceProvider::class,
 
     ],
 

config/cache.php

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

config/cors.php

@@ -11,13 +11,20 @@ return [
     | to accept any value.
     |
     */
-   
+        'paths' => ['api/*', 'sanctum/csrf-cookie'],
-    'supportsCredentials' => false,
+    
-    'allowedOrigins' => ['*'],
+        'allowed_methods' => ['*'],
-    'allowedOriginsPatterns' => [],
+    
-    'allowedHeaders' => ['*'],
+        'allowed_origins' => ['*'],
-    'allowedMethods' => ['*'],
+    
-    'exposedHeaders' => ['Content-Disposition'],
+        'allowed_origins_patterns' => [],
-    'maxAge' => 0,
+    
-
+        'allowed_headers' => ['*'],
-];
+    
+        'exposed_headers' => [],
+    
+        'max_age' => 0,
+    
+        'supports_credentials' => false,
+    ];
+    

config/session.php

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

docker-compose.yml

@@ -0,0 +1,67 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./docker/php/Dockerfile
+    container_name: laravel-app
+    restart: unless-stopped
+    volumes:
+      - .:/var/www/html
+      - ./storage:/var/www/html/storage
+      - ./bootstrap/cache:/var/www/html/bootstrap/cache
+    depends_on:
+      db_mysql:
+        condition: service_healthy
+    command: 
+      [ "sh", "-c", "/var/www/html/docker/php/entrypoint.sh" ]
+    healthcheck:
+      test: ["CMD", "pgrep", "php-fpm"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    networks:
+      - app_network
+
+
+  db_mysql:
+    image: mysql:8.2
+    container_name: db_mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: laravel
+      MYSQL_DATABASE: unioilLoyaltyApp
+      MYSQL_USER: admin_erish
+      MYSQL_PASSWORD: laravel
+    volumes:
+      - mysql-data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    networks:
+      - app_network
+
+  nginx:
+    image: nginx:alpine
+    container_name: nginx
+    restart: unless-stopped
+    ports:
+      - "80:80"
+    volumes:
+      - .:/var/www/html
+      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
+    depends_on:
+      app:
+        condition: service_healthy
+    networks:
+      - app_network
+
+volumes:
+  mysql-data:
+  storage-volume:
+    driver: local
+
+networks:
+  app_network:
+    driver: bridge

docker/nginx/default.conf

@@ -0,0 +1,25 @@
+server {
+    listen 80;
+    server_name localhost;
+
+    root /var/www/html/public;
+    index index.php index.html;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        include fastcgi_params;
+        fastcgi_pass app:9000; # laravel app container
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+
+    error_log /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+}

docker/php/Dockerfile

@@ -0,0 +1,33 @@
+# Base image
+FROM php:8.3-fpm-alpine
+
+# Install required dependencies for PHP extensions and GD
+RUN apk update && apk add --no-cache \
+    libpng-dev \
+    libjpeg-turbo-dev \
+    freetype-dev \
+    libzip-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install gd zip \
+    && docker-php-ext-install pdo_mysql
+
+# Install Composer
+COPY --from=composer:2.7 /usr/bin/composer /usr/bin/composer
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Copy app files
+COPY . /var/www/html
+
+# Ensure entrypoint script is executable
+RUN chmod +x /var/www/html/docker/php/entrypoint.sh
+
+# Set permissions for app files
+RUN chown -R www-data:www-data /var/www/html
+
+# Expose PHP-FPM port
+EXPOSE 9000
+
+# Start PHP-FPM (Handled in entrypoint.sh)
+CMD ["sh", "-c", "/var/www/html/docker/php/entrypoint.sh"]

docker/php/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Exit script on any error
+set -e
+
+# To Ensure we're in the right directory
+cd /var/www/html
+
+# Install dependencies
+echo "Installing Composer dependencies..."
+composer install --no-dev --optimize-autoloader
+
+# Set correct permissions for storage and cache
+echo "Setting correct permissions for storage and cache..."
+chown -R www-data:www-data storage bootstrap/cache
+chmod -R 775 storage bootstrap/
+
+# Run migrations 
+echo "Running migrations..."
+php artisan migrate --force
+
+# Start PHP-FPM
+echo "Starting PHP-FPM..."
+php-fpm

routes/api.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------

routes/web.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -11,11 +13,11 @@
 |
 */
 
-// Route::get('/', function () {
+Route::get('/', function () {
-//     return view('welcome');
+    return view('welcome');
-// });
+});
 
-Auth::routes();
+// Auth::routes();
-Auth::routes();
+// Auth::routes();
 
 Route::get('/home', 'HomeController@index')->name('home');