Merge pull request #339 from tighten/tm/upgrade-laravel-zero

Upgrade Laravel Zero to v11

.github/workflows/run-tests.yml

@@ -10,7 +10,8 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest, windows-latest, macos-latest]
-                php: [8.1, 8.2, 8.3]
+                php: [8.2, 8.3, 8.4]
+
         name: ${{ matrix.os }} - PHP ${{ matrix.php }}
 
         runs-on: ${{ matrix.os }}

.gitignore

@@ -4,5 +4,6 @@
 /.vagrant
 .phpunit.result.cache
 /storage
+.phpunit.cache/
 phpunit.xml
 composer.lock

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-cli-alpine
+FROM php:8.2-cli-alpine
 
 ENV TAKEOUT_CONTAINER=1
 

bootstrap/app.php

@@ -11,7 +11,9 @@
 |
 */
 
-$app = new LaravelZero\Framework\Application(
+use LaravelZero\Framework\Application;
+
+$app = new Application(
     dirname(__DIR__)
 );
 

composer.json

@@ -16,21 +16,21 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.2",
         "ext-json": "*",
         "ext-pcntl": "*",
         "ext-posix": "*",
         "composer/semver": "^3.4",
         "guzzlehttp/psr7": "^2.6"
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^7.4",
-        "laravel-zero/framework": "^9.0",
+        "guzzlehttp/guzzle": "^7.5",
+        "laravel-zero/framework": "^11.0",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/laravel-console-menu": "^3.3",
-        "phpunit/phpunit": "^9.0",
+        "nunomaduro/laravel-console-menu": "^3.4",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.5",
-        "tightenco/tlint": "^6.0"
+        "tightenco/tlint": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -49,10 +49,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true,
-        "platform-check": false,
-        "platform": {
-            "php": "8.0.2"
-        }
+        "platform-check": false
     },
     "scripts": {
         "lint:check": [

phpunit.xml.dist

@@ -1,29 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./app</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <server name="APP_ENV" value="testing"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Feature">
+      <directory suffix="Test.php">./tests/Feature</directory>
+    </testsuite>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <server name="APP_ENV" value="testing"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./app</directory>
+    </include>
+  </source>
 </phpunit>