PHP 8.2 support (#1279)

* PHP 8.2 support * wip * Apply fixes from StyleCI * wip * wip * wip * Update tests.yml Co-authored-by: StyleCI Bot <[email protected]>
laravel · Sep 8, 2022 · d0d42ac · d0d42ac
1 parent bc56e30
commit d0d42ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1]
+        php: ['7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1, 8.2]
 
     name: PHP ${{ matrix.php }}
 

diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php
@@ -9,6 +9,7 @@ class Brew
 {
     const SUPPORTED_PHP_VERSIONS = [
         'php',
+        '[email protected]',
         '[email protected]',
         '[email protected]',
         '[email protected]',

diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php
@@ -168,7 +168,7 @@ public function fpmConfigPath($phpVersion = null)
         $versionNormalized = $this->normalizePhpVersion($phpVersion === 'php' ? Brew::LATEST_PHP_VERSION : $phpVersion);
         $versionNormalized = preg_replace('~[^\d\.]~', '', $versionNormalized);
 
-        return BREW_PREFIX."/etc/php/${versionNormalized}/php-fpm.d/valet-fpm.conf";
+        return BREW_PREFIX."/etc/php/{$versionNormalized}/php-fpm.d/valet-fpm.conf";
     }
 
     /**

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,6 +3,7 @@
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
+         convertDeprecationsToExceptions="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"

diff --git a/tests/BrewTest.php b/tests/BrewTest.php
@@ -62,6 +62,10 @@ public function test_has_installed_php_indicates_if_php_is_installed_via_brew()
         $brew->shouldReceive('installedPhpFormulae')->andReturn(collect(['[email protected]']));
         $this->assertFalse($brew->hasInstalledPhp());
 
+        $brew = Mockery::mock(Brew::class.'[installedPhpFormulae]', [new CommandLine, new Filesystem]);
+        $brew->shouldReceive('installedPhpFormulae')->andReturn(collect(['[email protected]']));
+        $this->assertTrue($brew->hasInstalledPhp());
+
         $brew = Mockery::mock(Brew::class.'[installedPhpFormulae]', [new CommandLine, new Filesystem]);
         $brew->shouldReceive('installedPhpFormulae')->andReturn(collect(['[email protected]']));
         $this->assertTrue($brew->hasInstalledPhp());