Merge pull request #140 from Soean/php84

PHP 8.4: Explicit nullable type
wecodemore · Jan 15, 2025 · 6ff8cab · 6ff8cab
2 parents 63ef1e9 + 4f9e70f
commit 6ff8cab
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/Config/Result.php b/src/Config/Result.php
@@ -88,7 +88,7 @@ public static function promise(callable $provider): Result
      * @param mixed $value
      * @param \Throwable|null $error
      */
-    private function __construct($value = null, \Throwable $error = null)
+    private function __construct($value = null, ?\Throwable $error = null)
     {
         if ($value instanceof Result) {
             $this->value = $value->value;

diff --git a/src/Env/WordPressEnvBridge.php b/src/Env/WordPressEnvBridge.php
@@ -331,7 +331,7 @@ public static function loadedVars(): array
     /**
      * @param Dotenv|null $dotenv
      */
-    public function __construct(Dotenv $dotenv = null)
+    public function __construct(?Dotenv $dotenv = null)
     {
         $this->dotenv = $dotenv;
     }

diff --git a/src/Util/WpVersion.php b/src/Util/WpVersion.php
@@ -67,7 +67,7 @@ public static function normalize(string $version): string
     public function __construct(
         PackageFinder $packageFinder,
         Io $io,
-        string $fallbackVersion = null
+        ?string $fallbackVersion = null
     ) {
 
         $this->packageFinder = $packageFinder;

diff --git a/tests/integration/Cli/PhpToolProcessFactoryTest.php b/tests/integration/Cli/PhpToolProcessFactoryTest.php
@@ -215,7 +215,7 @@ private function assertProcessWorks(PhpToolProcess $process): void
      * @return PhpToolProcessFactory
      */
     private function factoryPhpToolProcessFactory(
-        UrlDownloader $urlDownloader = null
+        ?UrlDownloader $urlDownloader = null
     ): PhpToolProcessFactory {
 
         $composer = $this->factoryComposer();

diff --git a/tests/integration/Cli/WpCliToolTest.php b/tests/integration/Cli/WpCliToolTest.php
@@ -151,7 +151,7 @@ public function testCheckPharError(): void
      * @param string|null $cwd
      * @return WpCliTool
      */
-    private function factoryTool(string $cwd = null): WpCliTool
+    private function factoryTool(?string $cwd = null): WpCliTool
     {
         return new WpCliTool(
             new Config(

diff --git a/tests/src/IntegrationTestCase.php b/tests/src/IntegrationTestCase.php
@@ -142,7 +142,7 @@ protected function factoryComposerIo(
      * @return Paths
      */
     protected function factoryPaths(
-        string $cwd = null,
+        ?string $cwd = null,
         int $verbosity = OutputInterface::VERBOSITY_NORMAL,
         string $input = '',
         array $extra = []
@@ -171,7 +171,7 @@ protected function factoryPaths(
     protected function factoryComposerConfig(
         string $input = '',
         int $verbosity = OutputInterface::VERBOSITY_NORMAL,
-        string $cwd = null
+        ?string $cwd = null
     ): Composer\Config {
 
         return Composer\Factory::createConfig(
@@ -194,7 +194,7 @@ protected function factoryComposer(): Composer\Composer
      * @param string $cwd
      * @return SystemProcess
      */
-    protected function factorySystemProcess(string $cwd = null): SystemProcess
+    protected function factorySystemProcess(?string $cwd = null): SystemProcess
     {
         return new SystemProcess(
             $this->factoryPaths($cwd),
@@ -206,7 +206,7 @@ protected function factorySystemProcess(string $cwd = null): SystemProcess
      * @param string $cwd
      * @return PhpProcess
      */
-    protected function factoryPhpProcess(string $cwd = null): PhpProcess
+    protected function factoryPhpProcess(?string $cwd = null): PhpProcess
     {
         $php = (new PhpExecutableFinder())->find() ?: 'php';
 

diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -154,7 +154,7 @@ protected function factoryLocator(...$objects): Util\Locator
      * @param array|null $extra
      * @return Util\Paths
      */
-    protected function factoryPaths(array $extra = null): Util\Paths
+    protected function factoryPaths(?array $extra = null): Util\Paths
     {
         $root = $this->fixturesPath() . '/paths-root';
 

diff --git a/tests/unit/Util/RequirementsTest.php b/tests/unit/Util/RequirementsTest.php
@@ -175,7 +175,7 @@ public function testConfigsLoadedFromDefaultFileAreMerged()
      * @param string $customRoot
      * @return mixed
      */
-    private function executeExtractConfig(array $extra, string $customRoot = null): array
+    private function executeExtractConfig(array $extra, ?string $customRoot = null): array
     {
         $tester = \Closure::bind(
             function (string $rootPath) use ($extra): array {