Adjust Neos.Flow Composer subcontext

Author: Bernhard Schmitt

Neos.Flow/Classes/Composer/ComposerUtility.php

@@ -26,30 +26,27 @@ class ComposerUtility
     /**
      * Runtime cache for composer.json data
      *
-     * @var array
+     * @var array<string,array<string,mixed>>
      */
     protected static $composerManifestCache;
 
     /**
      * Runtime cache for composer.lock data
      *
-     * @var array
+     * @var array<string,mixed>
      */
     protected static $composerLockCache;
 
     /**
      * Returns contents of Composer manifest - or part there of.
      *
      * @param string $manifestPath
-     * @param string $configurationPath Optional. Only return the part of the manifest indexed by configurationPath
-     * @return array|mixed
+     * @param ?string $configurationPath Optional. Only return the part of the manifest indexed by configurationPath
+     * @return mixed
      */
     public static function getComposerManifest(string $manifestPath, ?string $configurationPath = null)
     {
         $composerManifest = static::readComposerManifest($manifestPath);
-        if ($composerManifest === null) {
-            return null;
-        }
 
         if ($configurationPath !== null) {
             return ObjectAccess::getPropertyPath($composerManifest, $configurationPath);
@@ -60,7 +57,7 @@ public static function getComposerManifest(string $manifestPath, ?string $config
     /**
      * Read the content of the composer.lock
      *
-     * @return array
+     * @return array<string,mixed>
      */
     public static function readComposerLock(): array
     {
@@ -72,8 +69,8 @@ public static function readComposerLock(): array
             return [];
         }
 
-        $json = file_get_contents(FLOW_PATH_ROOT . 'composer.lock');
-        $composerLock = json_decode($json, true);
+        $json = file_get_contents(FLOW_PATH_ROOT . 'composer.lock') ?: '';
+        $composerLock = json_decode($json, true, flags: JSON_THROW_ON_ERROR);
         $composerPackageVersions = isset($composerLock['packages']) ? $composerLock['packages'] : [];
         $composerPackageDevVersions = isset($composerLock['packages-dev']) ? $composerLock['packages-dev'] : [];
         self::$composerLockCache = array_merge($composerPackageVersions, $composerPackageDevVersions);
@@ -85,7 +82,7 @@ public static function readComposerLock(): array
      * Read the content of composer.json in the given path
      *
      * @param string $manifestPath
-     * @return array
+     * @return array<string,mixed>
      * @throws Exception\MissingPackageManifestException
      */
     protected static function readComposerManifest(string $manifestPath): array
@@ -98,8 +95,8 @@ protected static function readComposerManifest(string $manifestPath): array
         if (!is_file($manifestPathAndFilename)) {
             throw new Exception\MissingPackageManifestException(sprintf('No composer manifest file found at "%s".', $manifestPathAndFilename), 1349868540);
         }
-        $json = file_get_contents($manifestPathAndFilename);
-        $composerManifest = json_decode($json, true);
+        $json = file_get_contents($manifestPathAndFilename) ?: '';
+        $composerManifest = json_decode($json, true, flags: JSON_THROW_ON_ERROR);
 
         if ($composerManifest === null) {
             throw new Exception\InvalidPackageManifestException(sprintf('The composer manifest file found at "%s" could not be parsed. Check for JSON syntax errors!', $manifestPathAndFilename), 1493909988);
@@ -131,18 +128,16 @@ public static function isFlowPackageType(string $packageType): bool
      *
      * @param string $manifestPath
      * @param FlowPackageKey $packageKey
-     * @param array $composerManifestData
-     * @return array the manifest data written
+     * @param array<string,mixed> $composerManifestData
+     * @return array<string,mixed> the manifest data written
      */
     public static function writeComposerManifest(string $manifestPath, FlowPackageKey $packageKey, array $composerManifestData = []): array
     {
         $manifest = [
             'description' => ''
         ];
 
-        if ($composerManifestData !== null) {
-            $manifest = array_merge($manifest, $composerManifestData);
-        }
+        $manifest = array_merge($manifest, $composerManifestData);
         if (!isset($manifest['name']) || empty($manifest['name'])) {
             $manifest['name'] = $packageKey->deriveComposerPackageName();
         }

Neos.Flow/Classes/Composer/InstallerScripts.php

@@ -37,19 +37,23 @@ class InstallerScripts
      */
     public static function postUpdateAndInstall(Event $event): void
     {
+        $workingDirectory = getcwd();
+        if ($workingDirectory === false) {
+            throw new \RuntimeException('Could not resolve working directory', 1744470280);
+        }
         if (!defined('FLOW_PATH_ROOT')) {
-            define('FLOW_PATH_ROOT', Files::getUnixStylePath(getcwd()) . '/');
+            define('FLOW_PATH_ROOT', Files::getUnixStylePath($workingDirectory) . '/');
         }
 
         if (!defined('FLOW_PATH_PACKAGES')) {
-            define('FLOW_PATH_PACKAGES', Files::getUnixStylePath(getcwd()) . '/Packages/');
+            define('FLOW_PATH_PACKAGES', Files::getUnixStylePath($workingDirectory) . '/Packages/');
         }
 
         if (!defined('FLOW_PATH_CONFIGURATION')) {
-            define('FLOW_PATH_CONFIGURATION', Files::getUnixStylePath(getcwd()) . '/Configuration/');
+            define('FLOW_PATH_CONFIGURATION', Files::getUnixStylePath($workingDirectory) . '/Configuration/');
         }
         if (!defined('FLOW_PATH_TEMPORARY_BASE')) {
-            define('FLOW_PATH_TEMPORARY_BASE', Files::getUnixStylePath(getcwd()) . '/Data/Temporary');
+            define('FLOW_PATH_TEMPORARY_BASE', Files::getUnixStylePath($workingDirectory) . '/Data/Temporary');
         }
 
         Files::createDirectoryRecursively('Configuration');
@@ -106,14 +110,19 @@ public static function postPackageUpdateAndInstall(PackageEvent $event): void
      */
     protected static function copyDistributionFiles(string $installerResourcesDirectory): void
     {
+        $workingDirectory = getcwd();
+        if ($workingDirectory === false) {
+            throw new \RuntimeException('Could not resolve working directory', 1744470280);
+        }
+
         $essentialsPath = $installerResourcesDirectory . 'Distribution/Essentials';
         if (is_dir($essentialsPath)) {
-            Files::copyDirectoryRecursively($essentialsPath, Files::getUnixStylePath(getcwd()) . '/', false, true);
+            Files::copyDirectoryRecursively($essentialsPath, Files::getUnixStylePath($workingDirectory) . '/', false, true);
         }
 
         $defaultsPath = $installerResourcesDirectory . 'Distribution/Defaults';
         if (is_dir($defaultsPath)) {
-            Files::copyDirectoryRecursively($defaultsPath, Files::getUnixStylePath(getcwd()) . '/', true, true);
+            Files::copyDirectoryRecursively($defaultsPath, Files::getUnixStylePath($workingDirectory) . '/', true, true);
         }
     }
 
@@ -127,7 +136,7 @@ protected static function copyDistributionFiles(string $installerResourcesDirect
      */
     protected static function runPackageScripts(string $staticMethodReference, PackageEvent $event): void
     {
-        $className = substr($staticMethodReference, 0, strpos($staticMethodReference, '::'));
+        $className = substr($staticMethodReference, 0, strpos($staticMethodReference, '::') ?: 0);
         $methodName = substr($staticMethodReference, strpos($staticMethodReference, '::') + 2);
 
         if (!class_exists($className)) {