[8.x] PHP 8.1 Support (#39034)

driesvints · mallardduck · web-flow · commit 1ad807a637ec · 2021-10-22T08:20:42.000-05:00
* Remove platform requirement * Enable prefer-lowest builds for PHP 8.1 * Bump whoops * Minimum symfony version * Bump carbon * Try dev * Require commonmark * Add phpunit * Bump predis * More clearly describe failing mail tests * Remove skips for Redis tests * try predis dev * Make ArgonHasher aware of argon provider (#39046) * Make ArgonHasher aware of argon provider If sodium provides the argon2 then threads must be 1, if "standard" (libargon2) is the provider it can be 1 or 2. Not sure why this seems to only affect PHP 8.1 however as the behaviour seems to date back quite a bit. https://github.com/php/php-src/blob/2a3760a2d12b1a4c5c0207386b6cae84e404ee7e/ext/sodium/sodium_pwhash.c#L197 * remove skips for Hashing tests * Enable tests * Re-skip test * Adjust skips * Re-enable dynamodb tests * Bump predis * Bump PHP AWS SDK * Remove test skipping * Update tests.yml * Update tests.yml * Bump SwiftMailer * string fallbacks * Update phpunit.xml.dist * Remove skips Co-authored-by: Dan <self@danpock.me>
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,11 +36,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.3', '7.4', '8.0']
+        php: ['7.3', '7.4', '8.0', '8.1']
         stability: [prefer-lowest, prefer-stable]
-        include:
-          - php: '8.1'
-            stability: prefer-stable
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
@@ -56,18 +53,22 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Mimic PHP 8.0
-        run: composer config platform.php 8.0.999
-        if: matrix.php > 8
-
-      - name: Set Minimum Guzzle Version
+      - 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:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require symfony/symfony:5.4.x-dev league/commonmark:^2.0.2 phpunit/phpunit:^9.5.8 --no-interaction --no-update
+        if: matrix.php >= 8.1
+
       - name: Install dependencies
         uses: nick-invision/retry@v1
         with:
@@ -99,11 +100,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.3', '7.4', '8.0']
+        php: ['7.3', '7.4', '8.0', '8.1']
         stability: [prefer-lowest, prefer-stable]
-        include:
-          - php: '8.1'
-            stability: prefer-stable
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
 
@@ -124,18 +122,22 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Mimic PHP 8.0
-        run: composer config platform.php 8.0.999
-        if: matrix.php > 8
-
-      - name: Set Minimum Guzzle Version
+      - 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:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require symfony/symfony:5.4.x-dev league/commonmark:^2.0.2 phpunit/phpunit:^9.5.8 --no-interaction --no-update
+        if: matrix.php >= 8.1
+
       - name: Install dependencies
         uses: nick-invision/retry@v1
         with:
diff --git a/composer.json b/composer.json
@@ -26,13 +26,13 @@
         "league/commonmark": "^1.3|^2.0.2",
         "league/flysystem": "^1.1",
         "monolog/monolog": "^2.0",
-        "nesbot/carbon": "^2.31",
+        "nesbot/carbon": "^2.53.1",
         "opis/closure": "^3.6",
         "psr/container": "^1.0",
         "psr/log": "^1.0 || ^2.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.2.2",
-        "swiftmailer/swiftmailer": "^6.0",
+        "swiftmailer/swiftmailer": "^6.3",
         "symfony/console": "^5.1.4",
         "symfony/error-handler": "^5.1.4",
         "symfony/finder": "^5.1.4",
@@ -80,16 +80,16 @@
         "illuminate/view": "self.version"
     },
     "require-dev": {
-        "aws/aws-sdk-php": "^3.189.0",
+        "aws/aws-sdk-php": "^3.198.1",
         "doctrine/dbal": "^2.13.3|^3.1.2",
-        "filp/whoops": "^2.8",
+        "filp/whoops": "^2.14.3",
         "guzzlehttp/guzzle": "^6.5.5|^7.0.1",
         "league/flysystem-cached-adapter": "^1.0",
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench-core": "^6.23",
         "pda/pheanstalk": "^4.0",
         "phpunit/phpunit": "^8.5.19|^9.5.8",
-        "predis/predis": "^1.1.2",
+        "predis/predis": "^1.1.9",
         "symfony/cache": "^5.1.4"
     },
     "provide": {
@@ -131,10 +131,10 @@
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
         "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
-        "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.189.0).",
+        "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.2).",
-        "filp/whoops": "Required for friendly error pages in development (^2.8).",
+        "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
         "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
@@ -145,7 +145,7 @@
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
         "phpunit/phpunit": "Required to use assertions and run tests (^8.5.19|^9.5.8).",
-        "predis/predis": "Required to use the predis connector (^1.1.2).",
+        "predis/predis": "Required to use the predis connector (^1.1.9).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,6 +3,7 @@
          backupStaticAttributes="false"
          beStrictAboutTestsThatDoNotTestAnything="false"
          colors="true"
+         convertDeprecationsToExceptions="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -651,7 +651,7 @@ protected function replaceBaseUrl($uri, $url)
      */
     public function files($directory = null, $recursive = false)
     {
-        $contents = $this->driver->listContents($directory, $recursive);
+        $contents = $this->driver->listContents($directory ?? '', $recursive);
 
         return $this->filterContentsByType($contents, 'file');
     }
@@ -676,7 +676,7 @@ public function allFiles($directory = null)
      */
     public function directories($directory = null, $recursive = false)
     {
-        $contents = $this->driver->listContents($directory, $recursive);
+        $contents = $this->driver->listContents($directory ?? '', $recursive);
 
         return $this->filterContentsByType($contents, 'dir');
     }
diff --git a/src/Illuminate/Hashing/ArgonHasher.php b/src/Illuminate/Hashing/ArgonHasher.php
@@ -45,7 +45,7 @@ public function __construct(array $options = [])
     {
         $this->time = $options['time'] ?? $this->time;
         $this->memory = $options['memory'] ?? $this->memory;
-        $this->threads = $options['threads'] ?? $this->threads;
+        $this->threads = $this->threads($options);
         $this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;
     }
 
@@ -187,6 +187,10 @@ protected function time(array $options)
      */
     protected function threads(array $options)
     {
+        if (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER === 'sodium') {
+            return 1;
+        }
+
         return $options['threads'] ?? $this->threads;
     }
 }
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -23,7 +23,7 @@
         "illuminate/support": "^8.0",
         "league/commonmark": "^1.3|^2.0.2",
         "psr/log": "^1.0",
-        "swiftmailer/swiftmailer": "^6.0",
+        "swiftmailer/swiftmailer": "^6.3",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"
     },
     "autoload": {
@@ -37,7 +37,7 @@
         }
     },
     "suggest": {
-        "aws/aws-sdk-php": "Required to use the SES mail driver (^3.189.0).",
+        "aws/aws-sdk-php": "Required to use the SES mail driver (^3.198.1).",
         "guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.5.5|^7.0.1).",
         "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
     },
diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json
@@ -42,7 +42,7 @@
     "suggest": {
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
-        "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.189.0).",
+        "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.198.1).",
         "illuminate/redis": "Required to use the Redis queue driver (^8.0).",
         "pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)."
     },
diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json
@@ -27,7 +27,7 @@
     },
     "suggest": {
         "ext-redis": "Required to use the phpredis connector (^4.0|^5.0).",
-        "predis/predis": "Required to use the predis connector (^1.1.2)."
+        "predis/predis": "Required to use the predis connector (^1.1.9)."
     },
     "extra": {
         "branch-alias": {
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
@@ -21,7 +21,7 @@
         "illuminate/collections": "^8.0",
         "illuminate/contracts": "^8.0",
         "illuminate/macroable": "^8.0",
-        "nesbot/carbon": "^2.31",
+        "nesbot/carbon": "^2.53.1",
         "voku/portable-ascii": "^1.4.8"
     },
     "conflict": {
diff --git a/tests/Hashing/HasherTest.php b/tests/Hashing/HasherTest.php
@@ -23,10 +23,6 @@ public function testBasicBcryptHashing()
 
     public function testBasicArgon2iHashing()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         if (! defined('PASSWORD_ARGON2I')) {
             $this->markTestSkipped('PHP not compiled with Argon2i hashing support.');
         }
@@ -42,10 +38,6 @@ public function testBasicArgon2iHashing()
 
     public function testBasicArgon2idHashing()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         if (! defined('PASSWORD_ARGON2ID')) {
             $this->markTestSkipped('PHP not compiled with Argon2id hashing support.');
         }
@@ -64,10 +56,6 @@ public function testBasicArgon2idHashing()
      */
     public function testBasicBcryptVerification()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         $this->expectException(RuntimeException::class);
 
         if (! defined('PASSWORD_ARGON2I')) {
diff --git a/tests/Integration/Cache/DynamoDbStoreTest.php b/tests/Integration/Cache/DynamoDbStoreTest.php
@@ -20,10 +20,6 @@ protected function setUp(): void
             $this->markTestSkipped('DynamoDB not configured.');
         }
 
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         parent::setUp();
     }
 
diff --git a/tests/Integration/Mail/RenderingMailWithLocaleTest.php b/tests/Integration/Mail/RenderingMailWithLocaleTest.php
@@ -29,32 +29,20 @@ protected function getEnvironmentSetUp($app)
 
     public function testMailableRendersInDefaultLocale()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         $mail = new RenderedTestMail;
 
         $this->assertStringContainsString('name', $mail->render());
     }
 
     public function testMailableRendersInSelectedLocale()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         $mail = (new RenderedTestMail)->locale('es');
 
         $this->assertStringContainsString('nombre', $mail->render());
     }
 
     public function testMailableRendersInAppSelectedLocale()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         $this->app->setLocale('es');
 
         $mail = new RenderedTestMail;
diff --git a/tests/Integration/Queue/JobEncryptionTest.php b/tests/Integration/Queue/JobEncryptionTest.php
@@ -31,10 +31,6 @@ protected function getEnvironmentSetUp($app)
 
     protected function setUp(): void
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         parent::setUp();
 
         Schema::create('jobs', function (Blueprint $table) {
diff --git a/tests/Integration/Queue/QueueConnectionTest.php b/tests/Integration/Queue/QueueConnectionTest.php
@@ -16,15 +16,6 @@
  */
 class QueueConnectionTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
-        parent::setUp();
-    }
-
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('app.debug', 'true');
diff --git a/tests/Mail/MailSesTransportTest.php b/tests/Mail/MailSesTransportTest.php
@@ -16,10 +16,6 @@ class MailSesTransportTest extends TestCase
 {
     public function testGetTransport()
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         $container = new Container;
 
         $container->singleton('config', function () {
diff --git a/tests/Queue/DynamoDbFailedJobProviderTest.php b/tests/Queue/DynamoDbFailedJobProviderTest.php
@@ -14,15 +14,6 @@
 
 class DynamoDbFailedJobProviderTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
-        parent::setUp();
-    }
-
     protected function tearDown(): void
     {
         m::close();
diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
@@ -30,10 +30,6 @@ class RedisQueueIntegrationTest extends TestCase
 
     protected function setUp(): void
     {
-        if (\PHP_VERSION_ID >= 80100) {
-            $this->markTestSkipped('Test failing in PHP 8.1');
-        }
-
         Carbon::setTestNow(Carbon::now());
         parent::setUp();
         $this->setUpRedis();
diff --git a/tests/Redis/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ protected function replaceBaseUrl($uri, $url)`
`651`	`651`	`*/`
`652`	`652`	`public function files($directory = null, $recursive = false)`
`653`	`653`	`{`
`654`		`- $contents = $this->driver->listContents($directory, $recursive);`
	`654`	`+ $contents = $this->driver->listContents($directory ?? '', $recursive);`
`655`	`655`
`656`	`656`	`return $this->filterContentsByType($contents, 'file');`
`657`	`657`	`}`
`@@ -676,7 +676,7 @@ public function allFiles($directory = null)`
`676`	`676`	`*/`
`677`	`677`	`public function directories($directory = null, $recursive = false)`
`678`	`678`	`{`
`679`		`- $contents = $this->driver->listContents($directory, $recursive);`
	`679`	`+ $contents = $this->driver->listContents($directory ?? '', $recursive);`
`680`	`680`
`681`	`681`	`return $this->filterContentsByType($contents, 'dir');`
`682`	`682`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct(array $options = [])`
`45`	`45`	`{`
`46`	`46`	`$this->time = $options['time'] ?? $this->time;`
`47`	`47`	`$this->memory = $options['memory'] ?? $this->memory;`
`48`		`- $this->threads = $options['threads'] ?? $this->threads;`
	`48`	`+ $this->threads = $this->threads($options);`
`49`	`49`	`$this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;`
`50`	`50`	`}`
`51`	`51`
`@@ -187,6 +187,10 @@ protected function time(array $options)`
`187`	`187`	`*/`
`188`	`188`	`protected function threads(array $options)`
`189`	`189`	`{`
	`190`	`+ if (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER === 'sodium') {`
	`191`	`+ return 1;`
	`192`	`+ }`
	`193`	`+`
`190`	`194`	`return $options['threads'] ?? $this->threads;`
`191`	`195`	`}`
`192`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,6 @@ public function testBasicBcryptHashing()`
`23`	`23`
`24`	`24`	`public function testBasicArgon2iHashing()`
`25`	`25`	`{`
`26`		`- if (\PHP_VERSION_ID >= 80100) {`
`27`		`- $this->markTestSkipped('Test failing in PHP 8.1');`
`28`		`- }`
`29`		`-`
`30`	`26`	`if (! defined('PASSWORD_ARGON2I')) {`
`31`	`27`	`$this->markTestSkipped('PHP not compiled with Argon2i hashing support.');`
`32`	`28`	`}`
`@@ -42,10 +38,6 @@ public function testBasicArgon2iHashing()`
`42`	`38`
`43`	`39`	`public function testBasicArgon2idHashing()`
`44`	`40`	`{`
`45`		`- if (\PHP_VERSION_ID >= 80100) {`
`46`		`- $this->markTestSkipped('Test failing in PHP 8.1');`
`47`		`- }`
`48`		`-`
`49`	`41`	`if (! defined('PASSWORD_ARGON2ID')) {`
`50`	`42`	`$this->markTestSkipped('PHP not compiled with Argon2id hashing support.');`
`51`	`43`	`}`
`@@ -64,10 +56,6 @@ public function testBasicArgon2idHashing()`
`64`	`56`	`*/`
`65`	`57`	`public function testBasicBcryptVerification()`
`66`	`58`	`{`
`67`		`- if (\PHP_VERSION_ID >= 80100) {`
`68`		`- $this->markTestSkipped('Test failing in PHP 8.1');`
`69`		`- }`
`70`		`-`
`71`	`59`	`$this->expectException(RuntimeException::class);`
`72`	`60`
`73`	`61`	`if (! defined('PASSWORD_ARGON2I')) {`