Merge pull request #54 from vedmant/dev

Upgrade to Laravel 10

Dockerfile

@@ -1,44 +1,15 @@
-FROM php:8-fpm
+FROM php:8.2-fpm
 
-# Get repository and install wget and vim
-RUN apt-get update && apt-get install --no-install-recommends -y wget vim git unzip apt-transport-https gnupg
-
-RUN apt-get install -y locales \
-    && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
-    && locale-gen
-
-# Install PHP extensions deps
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libpng-dev \
-        zlib1g-dev \
-        libicu-dev \
-        unixodbc-dev \
-        libssl-dev \
-        g++
-
-# Install PHP extensions
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install \
-            mbstring \
-            pdo_mysql \
-            zip \
-            ftp \
-    && docker-php-ext-enable \
-            opcache
+# Install supervisor
+RUN apt-get update && apt-get install -y git supervisor unzip
 
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- \
         --install-dir=/usr/local/bin \
         --filename=composer
 
-# Install supervisor
-RUN apt-get install -y supervisor
-
 # Install Node
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs
 
 # Install Yarn
@@ -49,17 +20,8 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 # Clean repository
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Set timezone
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime
-RUN "date"
-
 CMD mkdir -p /app
 
-VOLUME /app
-
-CMD chown -R www-data:www-data /app
-
 WORKDIR /app
 
 CMD ["/usr/bin/supervisord", "-n", "-c",  "/etc/supervisord.conf"]

app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

composer.json

@@ -10,13 +10,12 @@
   "require": {
     "php": "^8.0",
     "fakerphp/faker": "^1.19",
-    "fruitcake/laravel-cors": "^2.0.5",
     "guzzlehttp/guzzle": "^7.2",
-    "laravel/framework": "^9.0",
-    "laravel/sanctum": "^2.14",
-    "laravel/telescope": "^4.7",
+    "laravel/framework": "^10.0",
+    "laravel/sanctum": "^3.2",
+    "laravel/telescope": "^v4.16.0",
     "laravel/tinker": "^2.7",
-    "laravel/ui": "^3.4"
+    "laravel/ui": "^v4.2.2"
   },
   "require-dev": {
     "barryvdh/laravel-ide-helper": "^2.12",
@@ -26,7 +25,7 @@
     "mockery/mockery": "^1.4.4",
     "nunomaduro/collision": "^6.1",
     "phpunit/phpunit": "^9.5.10",
-    "spatie/laravel-ignition": "^1.0"
+    "spatie/laravel-ignition": "^2.0"
   },
   "autoload": {
     "psr-4": {
@@ -66,8 +65,12 @@
   "config": {
     "optimize-autoloader": true,
     "preferred-install": "dist",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "pestphp/pest-plugin": true,
+      "php-http/discovery": true
+    }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "stable",
   "prefer-stable": true
 }