Bump minimum version to PHP 8.1 (#41250)

driesvints · web-flow · commit c4271001aa15 · 2022-02-25T13:53:33.000-06:00
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           tools: composer:v2
           coverage: none
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', '8.1']
+        php: [8.1]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -57,14 +57,6 @@ jobs:
           REDIS_CONFIGURE_OPTS: --enable-redis --enable-redis-igbinary --enable-redis-msgpack --enable-redis-lzf --with-liblzf --enable-redis-zstd --with-libzstd --enable-redis-lz4 --with-liblz4
           REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev
 
-      - name: Set Minimum PHP 8.0 Versions
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update
-        if: matrix.php >= 8
-
       - name: Set Minimum PHP 8.1 Versions
         uses: nick-invision/retry@v1
         with:
@@ -104,7 +96,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', '8.1']
+        php: [8.1]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
@@ -126,14 +118,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Set Minimum PHP 8.0 Versions
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update
-        if: matrix.php >= 8
-
       - name: Install dependencies
         uses: nick-invision/retry@v1
         with:
diff --git a/bin/test.sh b/bin/test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 down=false
-php="8.0"
+php="8.1"
 
 while true; do
   case "$1" in
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "doctrine/inflector": "^2.0",
diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/http": "^10.0",
diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "psr/log": "^1.0|^2.0|^3.0",
         "illuminate/bus": "^10.0",
diff --git a/src/Illuminate/Bus/composer.json b/src/Illuminate/Bus/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/pipeline": "^10.0",
diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/conditionable": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0"
diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0"
     },
diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/contracts": "^10.0",
         "psr/container": "^1.1.1|^2.0.1"
     },
diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/simple-cache": "^1.0|^2.0|^3.0"
     },
diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/container": "^10.0",
diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/bus": "^10.0",
         "illuminate/collections": "^10.0",
         "illuminate/container": "^10.0",
diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/contracts": "^10.0",
         "illuminate/support": "^10.0"
     },
diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "fruitcake/php-cors": "^1.2",
         "illuminate/collections": "^10.0",
diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/contracts": "^10.0",
         "illuminate/support": "^10.0",
         "monolog/monolog": "^2.0"
diff --git a/src/Illuminate/Macroable/composer.json b/src/Illuminate/Macroable/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2"
+        "php": "^8.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/container": "^10.0",
diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/broadcasting": "^10.0",
         "illuminate/bus": "^10.0",
         "illuminate/collections": "^10.0",
diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
diff --git a/src/Illuminate/Pipeline/composer.json b/src/Illuminate/Pipeline/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/contracts": "^10.0",
         "illuminate/support": "^10.0"
     },
diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/console": "^10.0",
diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/container": "^10.0",
diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/inflector": "^2.0",
diff --git a/src/Illuminate/Testing/composer.json b/src/Illuminate/Testing/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/contracts": "^10.0",
diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "egulias/email-validator": "^3.1",
         "illuminate/collections": "^10.0",
diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "illuminate/collections": "^10.0",
         "illuminate/container": "^10.0",
diff --git a/tests/Database/DatabaseEloquentMorphToTest.php b/tests/Database/DatabaseEloquentMorphToTest.php
@@ -20,9 +20,6 @@ protected function tearDown(): void
         m::close();
     }
 
-    /**
-     * @requires PHP >= 8.1
-     */
     public function testLookupDictionaryIsProperlyConstructedForEnums()
     {
         $relation = $this->getRelation();
diff --git a/tests/Integration/Database/EloquentModelEnumCastingTest.php b/tests/Integration/Database/EloquentModelEnumCastingTest.php
@@ -7,13 +7,8 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-if (PHP_VERSION_ID >= 80100) {
-    include 'Enums.php';
-}
+include 'Enums.php';
 
-/**
- * @requires PHP >= 8.1
- */
 class EloquentModelEnumCastingTest extends DatabaseTestCase
 {
     protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
diff --git a/tests/Integration/Database/QueryingWithEnumsTest.php b/tests/Integration/Database/QueryingWithEnumsTest.php
@@ -6,13 +6,8 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-if (PHP_VERSION_ID >= 80100) {
-    include_once 'Enums.php';
-}
+include_once 'Enums.php';
 
-/**
- * @requires PHP >= 8.1
- */
 class QueryingWithEnumsTest extends DatabaseTestCase
 {
     protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
diff --git a/tests/Integration/Routing/ImplicitBackedEnumRouteBindingTest.php b/tests/Integration/Routing/ImplicitBackedEnumRouteBindingTest.php
diff --git a/tests/Routing/ImplicitRouteBindingTest.php b/tests/Routing/ImplicitRouteBindingTest.php
diff --git a/tests/Validation/ValidationEnumRuleTest.php b/tests/Validation/ValidationEnumRuleTest.php

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"require": {`
`18`		`- "php": "^8.0.2",`
	`18`	`+ "php": "^8.1",`
`19`	`19`	`"ext-mbstring": "*",`
`20`	`20`	`"ext-openssl": "*",`
`21`	`21`	`"doctrine/inflector": "^2.0",`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"require": {`
`17`		`- "php": "^8.0.2",`
	`17`	`+ "php": "^8.1",`
`18`	`18`	`"illuminate/collections": "^10.0",`
`19`	`19`	`"illuminate/contracts": "^10.0",`
`20`	`20`	`"illuminate/http": "^10.0",`