[php] Update Laravel to v9 (#7659)

* [php] Laravel update to v9 * PHP 8.1 * Update variants and delete dev libs * Roadrunner update to laravel v9
TechEmpower · Nov 2, 2022 · 3eee10b · 3eee10b
1 parent d0d1f46
commit 3eee10b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 70 deletions.
diff --git a/frameworks/PHP/laravel/composer.json b/frameworks/PHP/laravel/composer.json
@@ -8,14 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "laravel/framework": "^8.70"
-    },
-    "require-dev": {
-        "facade/ignition": "^2.3.6",
-        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
+        "laravel/framework": "^9"
     },
     "config": {
         "optimize-autoloader": true,
@@ -32,11 +25,6 @@
             "App\\": "app/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

diff --git a/frameworks/PHP/laravel/deploy/laravel-s/composer.json b/frameworks/PHP/laravel/deploy/laravel-s/composer.json
@@ -8,17 +8,10 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
-        "laravel/framework": "^8.0",
+        "php": "^7.3|^8.1",
+        "laravel/framework": "^9",
         "hhxsv5/laravel-s": "~3.7.0"
     },
-    "require-dev": {
-        "facade/ignition": "^2.3.6",
-        "fzaninotto/faker": "^1.9.1",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
-    },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
@@ -34,11 +27,6 @@
             "App\\": "app/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

diff --git a/frameworks/PHP/laravel/deploy/roadrunner/composer.json b/frameworks/PHP/laravel/deploy/roadrunner/composer.json
@@ -8,17 +8,10 @@
     ],
     "license": "MIT",
     "require": {
-        "laravel/framework": "^8.70",
+        "laravel/framework": "^9",
         "nyholm/psr7": "*",
-        "spiral/roadrunner": "^2.5",
-        "spiral/roadrunner-laravel": "^5.4"
-    },
-    "require-dev": {
-        "facade/ignition": "^2.3.6",
-        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
+        "spiral/roadrunner": "^2.11",
+        "spiral/roadrunner-laravel": "^5.9"
     },
     "config": {
         "optimize-autoloader": true,
@@ -35,11 +28,6 @@
             "App\\": "app/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

diff --git a/frameworks/PHP/laravel/deploy/swoole/composer.json b/frameworks/PHP/laravel/deploy/swoole/composer.json
@@ -8,16 +8,9 @@
     ],
     "license": "MIT",
     "require": {
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^9",
         "swooletw/laravel-swoole": "^v2.6"
     },
-    "require-dev": {
-        "facade/ignition": "^2.3.6",
-        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
-    },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
@@ -33,11 +26,6 @@
             "App\\": "app/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
@@ -53,5 +41,3 @@
         ]
     }
 }
-
-
diff --git a/frameworks/PHP/laravel/laravel-laravel-s.dockerfile b/frameworks/PHP/laravel/laravel-laravel-s.dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 
 RUN pecl install swoole > /dev/null && \
     docker-php-ext-enable swoole

diff --git a/frameworks/PHP/laravel/laravel-roadrunner.dockerfile b/frameworks/PHP/laravel/laravel-roadrunner.dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 
 RUN docker-php-ext-install pdo_mysql pcntl opcache sockets > /dev/null
 

diff --git a/frameworks/PHP/laravel/laravel-swoole.dockerfile b/frameworks/PHP/laravel/laravel-swoole.dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 
 RUN pecl install swoole > /dev/null && \
     docker-php-ext-enable swoole

diff --git a/frameworks/PHP/laravel/laravel-workerman.dockerfile b/frameworks/PHP/laravel/laravel-workerman.dockerfile
@@ -3,9 +3,10 @@ FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq git unzip \
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
+    apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
+
+RUN apt-get install -yqq git unzip \
     php8.1-cli php8.1-mysql php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer

diff --git a/frameworks/PHP/laravel/laravel.dockerfile b/frameworks/PHP/laravel/laravel.dockerfile
@@ -3,11 +3,11 @@ FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip \
-    php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
-RUN apt-get install -yqq php8.1-mbstring php8.1-xml php8.1-dev > /dev/null
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
+    apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
+
+RUN apt-get install -yqq nginx git unzip \
+    php8.1-cli php8.1-fpm php8.1-mysql  php8.1-mbstring php8.1-xml php8.1-dev > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
@@ -30,5 +30,5 @@ EXPOSE 8080
 # RUN echo "catch_workers_output = yes" >> /etc/php/8.1/fpm/php-fpm.conf
 
 RUN mkdir -p /run/php
-CMD /usr/sbin/php-fpm8.1 --fpm-config /etc/php/8.1/fpm/php-fpm.conf && nginx -c /laravel/deploy/nginx.conf
-
+CMD /usr/sbin/php-fpm8.1 --fpm-config /etc/php/8.1/fpm/php-fpm.conf && \
+    nginx -c /laravel/deploy/nginx.conf