Merge pull request #26 from laravel/feat/php-8.1

Adds PHP 8.1 support
laravel · Oct 11, 2021 · 34e986d · 34e986d
2 parents d134774 + 284f468
commit 34e986d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,6 +35,7 @@ jobs:
 
       - name: Execute static analysis
         run: vendor/bin/phpstan
+        if: matrix.php == '8.0'
 
       - name: Execute unit/feature tests
         run: vendor/bin/pest
diff --git a/app/Commands/PhpLogsCommand.php b/app/Commands/PhpLogsCommand.php
@@ -33,7 +33,7 @@ public function handle()
         $this->ensurePhpExists();
 
         $version = $this->argument('version');
-        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'];
+        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'];
 
         abort_if(
             ! is_null($version) && ! in_array($version, $versions),

diff --git a/app/Commands/PhpRestartCommand.php b/app/Commands/PhpRestartCommand.php
@@ -34,7 +34,7 @@ public function handle()
         $server = $this->currentServer();
 
         $version = $this->argument('version');
-        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'];
+        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'];
 
         if (! is_null($version) && ! in_array($version, $versions)) {
             abort(1, 'PHP version needs to be one of these values: '.implode(', ', $versions).'.');

diff --git a/app/Commands/PhpStatusCommand.php b/app/Commands/PhpStatusCommand.php
@@ -34,7 +34,7 @@ public function handle()
         $server = $this->currentServer();
 
         $version = $this->argument('version');
-        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'];
+        $versions = ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'];
 
         if (! is_null($version) && ! in_array($version, $versions)) {
             abort(1, 'PHP version needs to be one of these values: '.implode(', ', $versions).'.');

diff --git a/tests/Feature/DaemonListCommandTest.php b/tests/Feature/DaemonListCommandTest.php
@@ -7,12 +7,12 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4  artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0  artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1  artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->artisan('daemon:list')
         ->expectsTable(['   ID', '   Command', '   Status'], [
             ['id' => '   1', 'name' => '   php7.4  artisan websockets:serve', 'phpVersion' => '   Installed'],
-            ['id' => '   2', 'name' => '   php8.0  artisan queue:work', 'phpVersion' => '   Installed'],
+            ['id' => '   2', 'name' => '   php8.1  artisan queue:work', 'phpVersion' => '   Installed'],
         ], 'compact');
 });
diff --git a/tests/Feature/DaemonLogsCommandTest.php b/tests/Feature/DaemonLogsCommandTest.php
@@ -7,7 +7,7 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->andReturn(
@@ -33,7 +33,7 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->andReturn(
@@ -59,7 +59,7 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->andReturn(
@@ -86,7 +86,7 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->andReturn(
@@ -109,7 +109,7 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->andReturn(

diff --git a/tests/Feature/DaemonRestartCommandTest.php b/tests/Feature/DaemonRestartCommandTest.php
@@ -7,11 +7,11 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'installed'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->with(1, 2)->once()->andReturn(
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     );
 
     $this->client->shouldReceive('restartDaemon')->with(1, 2, false)->once();
@@ -28,11 +28,11 @@
 
     $this->client->shouldReceive('daemons')->andReturn([
         (object) ['id' => 1, 'command' => 'php7.4 artisan websockets:serve', 'status' => 'restarting'],
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'installed'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'installed'],
     ]);
 
     $this->client->shouldReceive('daemon')->with(1, 1)->once()->andReturn(
-        (object) ['id' => 2, 'command' => 'php8.0 artisan queue:work', 'status' => 'restarting'],
+        (object) ['id' => 2, 'command' => 'php8.1 artisan queue:work', 'status' => 'restarting'],
     );
 
     $this->artisan('daemon:restart')

diff --git a/tests/Feature/PhpLogsTestCommandTest.php b/tests/Feature/PhpLogsTestCommandTest.php
@@ -22,13 +22,13 @@
     );
 
     $this->client->shouldReceive('logs')
-        ->with(Mockery::any(), 'php80')
+        ->with(Mockery::any(), 'php81')
         ->andReturn((object) [
-            'content' => "   tail: cannot open '/var/log/php8.0-fpm.log' for reading: No such file or directory\n   ",
+            'content' => "   tail: cannot open '/var/log/php8.1-fpm.log' for reading: No such file or directory\n   ",
         ]);
 
-    $this->artisan('php:logs', ['version' => '8.0'])
-        ->expectsOutput("  ▕ tail: cannot open '/var/log/php8.0-fpm.log' for reading: No such file or directory");
+    $this->artisan('php:logs', ['version' => '8.1'])
+        ->expectsOutput("  ▕ tail: cannot open '/var/log/php8.1-fpm.log' for reading: No such file or directory");
 });
 
 it('can not retrieve logs when php version is incorrect', function () {
@@ -37,7 +37,7 @@
     );
 
     $this->artisan('php:logs', ['version' => '2.0']);
-})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0.');
+})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1.');
 
 it('can not display the logs when there is no php', function () {
     $this->client->shouldReceive('server')->andReturn(

diff --git a/tests/Feature/PhpRestartCommandTest.php b/tests/Feature/PhpRestartCommandTest.php
@@ -35,7 +35,7 @@
     );
 
     $this->artisan('php:restart', ['version' => '2.0']);
-})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0.');
+})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1.');
 
 it('can not restart php when there is no php', function () {
     $this->client->shouldReceive('server')->andReturn(

diff --git a/tests/Feature/PhpStatusCommandTest.php b/tests/Feature/PhpStatusCommandTest.php
@@ -26,7 +26,7 @@
     );
 
     $this->artisan('php:status', ['version' => '2.0']);
-})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0.');
+})->throws('PHP version needs to be one of these values: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1.');
 
 it('can not display the status when there is no php', function () {
     $this->client->shouldReceive('server')->andReturn(