Rework PhpizePath to be passed to TargetPlatform

Author: asgrim

phpstan-baseline.neon

@@ -12,12 +12,6 @@ parameters:
 			count: 1
 			path: src/Command/CommandHelper.php
 
-		-
-			message: '#^Cannot cast mixed to string\.$#'
-			identifier: cast.string
-			count: 1
-			path: src/Command/CommandHelper.php
-
 		-
 			message: '#^Cannot cast mixed to string\.$#'
 			identifier: cast.string
@@ -480,6 +474,12 @@ parameters:
 			count: 1
 			path: test/unit/Installing/InstallForPhpProject/InstallSelectedPackageTest.php
 
+		-
+			message: '#^Access to an undefined property Php\\PieUnitTest\\SelfManage\\BuildTools\\PhpizeBuildToolFinderTest\:\:\$phpBinaryPath\.$#'
+			identifier: property.notFound
+			count: 3
+			path: test/unit/SelfManage/BuildTools/PhpizeBuildToolFinderTest.php
+
 		-
 			message: '#^Method Php\\PieUnitTest\\SelfManage\\Verify\\FallbackVerificationUsingOpenSslTest\:\:prepareCertificateAndSignature\(\) should return array\{string, string\} but returns array\{mixed, mixed\}\.$#'
 			identifier: return.type

src/Building/Build.php

@@ -7,7 +7,6 @@
 use Composer\IO\IOInterface;
 use Php\Pie\Downloading\DownloadedPackage;
 use Php\Pie\File\BinaryFile;
-use Php\Pie\Platform\TargetPhp\PhpizePath;
 use Php\Pie\Platform\TargetPlatform;
 
 /** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
@@ -19,6 +18,5 @@ public function __invoke(
         TargetPlatform $targetPlatform,
         array $configureOptions,
         IOInterface $io,
-        PhpizePath|null $phpizePath,
     ): BinaryFile;
 }

src/Building/UnixBuild.php

@@ -34,7 +34,6 @@ public function __invoke(
         TargetPlatform $targetPlatform,
         array $configureOptions,
         IOInterface $io,
-        PhpizePath|null $phpizePath,
     ): BinaryFile {
         $selectedDownloadMethod = DownloadUrlMethod::fromDownloadedPackage($downloadedPackage);
         switch ($selectedDownloadMethod) {
@@ -43,7 +42,7 @@ public function __invoke(
 
             case DownloadUrlMethod::ComposerDefaultDownload:
             case DownloadUrlMethod::PrePackagedSourceDownload:
-                return $this->buildFromSource($downloadedPackage, $targetPlatform, $configureOptions, $io, $phpizePath);
+                return $this->buildFromSource($downloadedPackage, $targetPlatform, $configureOptions, $io);
 
             default:
                 throw new LogicException('Unsupported download method: ' . $selectedDownloadMethod->value);
@@ -74,7 +73,6 @@ private function buildFromSource(
         TargetPlatform $targetPlatform,
         array $configureOptions,
         IOInterface $io,
-        PhpizePath|null $phpizePath,
     ): BinaryFile {
         $outputCallback = null;
         if ($io->isVerbose()) {
@@ -88,7 +86,7 @@ private function buildFromSource(
             };
         }
 
-        $phpizePath ??= PhpizePath::guessFrom($targetPlatform->phpBinaryPath);
+        $phpizePath = $targetPlatform->phpizePath ?? PhpizePath::guessFrom($targetPlatform->phpBinaryPath);
 
         /**
          * Call a cleanup first; most of the time, we expect to be changing a

src/Building/WindowsBuild.php

@@ -7,7 +7,6 @@
 use Composer\IO\IOInterface;
 use Php\Pie\Downloading\DownloadedPackage;
 use Php\Pie\File\BinaryFile;
-use Php\Pie\Platform\TargetPhp\PhpizePath;
 use Php\Pie\Platform\TargetPlatform;
 use Php\Pie\Platform\WindowsExtensionAssetName;
 
@@ -22,7 +21,6 @@ public function __invoke(
         TargetPlatform $targetPlatform,
         array $configureOptions,
         IOInterface $io,
-        PhpizePath|null $phpizePath,
     ): BinaryFile {
         $prebuiltDll = WindowsExtensionAssetName::determineDllName($targetPlatform, $downloadedPackage);
 

src/Command/BuildCommand.php

@@ -84,7 +84,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Resolve,
                 [], // Configure options are not needed for resolve only
-                null,
                 false, // setting up INI not needed for build
             ),
         );
@@ -126,7 +125,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Build,
                 $configureOptionsValues,
-                CommandHelper::determinePhpizePathFromInputs($input),
                 false, // setting up INI not needed for build
             ),
         );

src/Command/CommandHelper.php

@@ -185,15 +185,6 @@ public static function determineTargetPlatformFromInputs(InputInterface $input,
             throw new InvalidArgumentException('The --with-php-path=/path/to/php cannot be used on non-Windows, use --with-php-config=/path/to/php-config instead.');
         }
 
-        if (Platform::isWindows() && $input->hasOption(self::OPTION_WITH_PHPIZE_PATH)) {
-            /** @var mixed $withPhpizePath */
-            $withPhpizePath = $input->getOption(self::OPTION_WITH_PHPIZE_PATH);
-
-            if (is_string($withPhpizePath) && trim($withPhpizePath) !== '') {
-                throw new InvalidArgumentException('The --with-phpize-path=/path/to/phpize cannot be used on Windows.');
-            }
-        }
-
         if ($specifiedWithPhpConfig) {
             $phpBinaryPath = PhpBinaryPath::fromPhpConfigExecutable($withPhpConfig);
         }
@@ -210,7 +201,19 @@ public static function determineTargetPlatformFromInputs(InputInterface $input,
             }
         }
 
-        $targetPlatform = TargetPlatform::fromPhpBinaryPath($phpBinaryPath, $makeParallelJobs);
+        $phpizePath = null;
+        if ($input->hasOption(self::OPTION_WITH_PHPIZE_PATH)) {
+            $phpizePathOption = $input->getOption(self::OPTION_WITH_PHPIZE_PATH);
+            if (is_string($phpizePathOption) && trim($phpizePathOption) !== '') {
+                if (Platform::isWindows()) {
+                    throw new InvalidArgumentException('The --with-phpize-path=/path/to/phpize cannot be used on Windows.');
+                }
+
+                $phpizePath = new PhpizePath($phpizePathOption);
+            }
+        }
+
+        $targetPlatform = TargetPlatform::fromPhpBinaryPath($phpBinaryPath, $makeParallelJobs, $phpizePath);
 
         if (PiePlatform::isRunningStaticPhp()) {
             $io->write(sprintf('<info>You are running a PIE Static PHP %s build</info>', PHP_VERSION));
@@ -264,18 +267,6 @@ public static function shouldCheckForBuildTools(InputInterface $input): bool
             || ! $input->getOption(self::OPTION_SUPPRESS_BUILD_TOOLS_CHECK);
     }
 
-    public static function determinePhpizePathFromInputs(InputInterface $input): PhpizePath|null
-    {
-        if ($input->hasOption(self::OPTION_WITH_PHPIZE_PATH)) {
-            $phpizePathOption = (string) $input->getOption(self::OPTION_WITH_PHPIZE_PATH);
-            if (trim($phpizePathOption) !== '') {
-                return new PhpizePath($phpizePathOption);
-            }
-        }
-
-        return null;
-    }
-
     public static function requestedNameAndVersionPair(InputInterface $input): RequestedPackageAndVersion
     {
         $requestedPackageString = $input->getArgument(self::ARG_REQUESTED_PACKAGE_AND_VERSION);

src/Command/DownloadCommand.php

@@ -74,7 +74,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Download,
                 [], // Configure options are not needed for download only
-                null,
                 false, // setting up INI not needed for download
             ),
         );

src/Command/InfoCommand.php

@@ -79,7 +79,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Resolve,
                 [], // Configure options are not needed for resolve only
-                null,
                 false, // setting up INI not needed for info
             ),
         );

src/Command/InstallCommand.php

@@ -98,7 +98,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Resolve,
                 [], // Configure options are not needed for resolve only
-                null,
                 false, // setting up INI not needed for resolve step
             ),
         );
@@ -140,7 +139,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedNameAndVersion,
                 PieOperation::Install,
                 $configureOptionsValues,
-                CommandHelper::determinePhpizePathFromInputs($input),
                 CommandHelper::determineAttemptToSetupIniFile($input),
             ),
         );

src/Command/UninstallCommand.php

@@ -91,7 +91,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 $requestedPackageAndVersionToRemove,
                 PieOperation::Uninstall,
                 [], // Configure options are not needed for uninstall
-                null,
                 true,
             ),
         );