Merge pull request #1515 from saibotk/fix-php-fpm-config

fix(php-fpm): correct socket creation

Author: mattstauffer

cli/Valet/Brew.php

@@ -259,7 +259,7 @@ public function getParsedLinkedPhp(): array
     }
 
     /**
-     * Gets the currently linked formula by identifying the symlink in the hombrew bin directory.
+     * Gets the currently linked formula by identifying the symlink in the homebrew bin directory.
      * Different to ->linkedPhp() in that this will just get the linked directory name,
      * whether that is php, php74 or [email protected].
      */

cli/Valet/PhpFpm.php

@@ -37,7 +37,8 @@ public function install(): void
 
         $this->restart();
 
-        $this->symlinkPrimaryValetSock($phpVersion);
+        $linkedPhpVersion = $this->brew->linkedPhp();
+        $this->symlinkPrimaryValetSock($linkedPhpVersion);
     }
 
     /**
@@ -331,6 +332,6 @@ public function utilizedPhpVersions(): array
                     return $this->normalizePhpVersion(str_replace(['valet', '.sock'], '', $sock));
                 }
             }
-        })->merge([$this->brew->getLinkedPhpFormula()])->filter()->unique()->values()->toArray();
+        })->merge([$this->brew->linkedPhp()])->filter()->unique()->values()->toArray();
     }
 }

tests/PhpFpmTest.php

@@ -122,7 +122,7 @@ public function test_utilized_php_versions()
             '[email protected]',
         ]));
 
-        $brewMock->shouldReceive('getLinkedPhpFormula')->andReturn('[email protected]');
+        $brewMock->shouldReceive('linkedPhp')->andReturn('[email protected]');
 
         $nginxMock->shouldReceive('configuredSites')
             ->once()