PHP 8.1 compatibility

xmav · xmav · commit 1fa207ed5ea7 · 2021-12-15T18:24:02.000-06:00
- CR changes
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "3.6.1",
-        "symfony/process": ">=5.3.0",
+        "symfony/process": "~5.4.0",
         "mikey179/vfsstream": "*"
     },
     "replace": {
@@ -69,6 +69,5 @@
             "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
         ],
         "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-    },
-    "test_version": "101.500.900"
-}
+    }
+}
diff --git a/res/target.xml b/res/target.xml
@@ -12,4 +12,4 @@
 	<target name="mageweb" label="Magento Other web accessible file" uri="." />
 	<target name="magetest" label="Magento PHPUnit test" uri="./tests" />
 	<target name="mage" label="Magento other" uri="." />
-</targets>
+</targets>
diff --git a/src/MagentoHackathon/Composer/Magento/Deploystrategy/Copy.php b/src/MagentoHackathon/Composer/Magento/Deploystrategy/Copy.php
@@ -67,12 +67,12 @@ public function createDelegate($source, $dest)
                         continue;
                     }
                     $childSource = $this->removeTrailingSlash($source) . DIRECTORY_SEPARATOR . $item;
-                    $this->create($childSource, substr($destPath, strlen($this->getDestDir())));
+                    $this->create($childSource, substr($destPath, strlen($this->getDestDir()) + 1));
                 }
                 return true;
             } else {
                 $destPath = $this->removeTrailingSlash($destPath) . DIRECTORY_SEPARATOR . basename($source);
-                return $this->create($source, substr($destPath, strlen($this->getDestDir())));
+                return $this->create($source, substr($destPath, strlen($this->getDestDir()) + 1));
             }
         }
 
diff --git a/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php b/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php
@@ -287,7 +287,7 @@ public function create($source, $dest)
                 foreach ($matches as $match) {
                     $newDest = substr($destPath . '/' . basename($match), strlen($this->getDestDir()));
                     $newDest = ltrim($newDest, ' \\/');
-                    $this->create(substr($match, strlen($this->getSourceDir())), $newDest);
+                    $this->create(substr($match, strlen($this->getSourceDir()) + 1), $newDest);
                 }
                 return true;
             }
diff --git a/tests/FullStackTest/home/composer.json b/tests/FullStackTest/home/composer.json
@@ -6,7 +6,7 @@
         }
     ],
     "require": {
-        "magento-hackathon/magento-composer-installer": "*"
+        "magento/magento-composer-installer": "*"
     },
     "extra": {
         "magento-root-dir": "root"
diff --git a/tests/FullStackTest/magento-modules/composer_1.json b/tests/FullStackTest/magento-modules/composer_1.json
@@ -4,13 +4,13 @@
         "magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "1.*",
-        "magento-hackathon/magento-composer-installer-test-wildcard": "1.*",
-        "magento-hackathon/magento-composer-installer-test-library": "1.*"
+        "magento/magento-composer-installer-test-issue-87": "1.*",
+        "magento/magento-composer-installer-test-update-file-remove": "1.*",
+        "magento/magento-composer-installer-test-wildcard": "1.*",
+        "magento/magento-composer-installer-test-library": "1.*"
 	},
 	"require-dev": {
-		"magento-hackathon/composer-command-integrator": "*",
+
 		"composer/composer": "dev-main"
 	},
 	"repositories": [
@@ -25,7 +25,7 @@
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/FullStackTest/magento-modules/composer_1_copy.json b/tests/FullStackTest/magento-modules/composer_1_copy.json
@@ -4,14 +4,13 @@
         "magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "1.*",
-        "magento-hackathon/magento-composer-installer-test-wildcard": "1.*",
-        "magento-hackathon/magento-composer-installer-test-wildcard2": "1.*",
-        "magento-hackathon/magento-composer-installer-test-library": "1.*"
+        "magento/magento-composer-installer-test-issue-87": "1.*",
+        "magento/magento-composer-installer-test-update-file-remove": "1.*",
+        "magento/magento-composer-installer-test-wildcard": "1.*",
+        "magento/magento-composer-installer-test-wildcard2": "1.*",
+        "magento/magento-composer-installer-test-library": "1.*"
 	},
 	"require-dev": {
-		"magento-hackathon/composer-command-integrator": "*",
 		"composer/composer": "dev-main"
 	},
 	"repositories": [
@@ -26,7 +25,7 @@
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/FullStackTest/magento-modules/composer_1_copy_force.json b/tests/FullStackTest/magento-modules/composer_1_copy_force.json
@@ -4,17 +4,16 @@
 		"magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "1.*",
-        "magento-hackathon/magento-composer-installer-test-wildcard": "1.*",
-        "magento-hackathon/magento-composer-installer-test-wildcard2": "1.*",
-        "magento-hackathon/magento-composer-installer-test-library": "1.*",
-        "magento-hackathon/magento-composer-installer-test-sort1": "1.*",
-        "magento-hackathon/magento-composer-installer-test-sort2": "1.*",
-        "magento-hackathon/magento-composer-installer-test-sort3": "1.*"
+        "magento/magento-composer-installer-test-issue-87": "1.*",
+        "magento/magento-composer-installer-test-update-file-remove": "1.*",
+        "magento/magento-composer-installer-test-wildcard": "1.*",
+        "magento/magento-composer-installer-test-wildcard2": "1.*",
+        "magento/magento-composer-installer-test-library": "1.*",
+        "magento/magento-composer-installer-test-sort1": "1.*",
+        "magento/magento-composer-installer-test-sort2": "1.*",
+        "magento/magento-composer-installer-test-sort3": "1.*"
 	},
 	"require-dev": {
-		"magento-hackathon/composer-command-integrator": "*",
 		"composer/composer": "dev-main"
 	},
 	"repositories": [
@@ -27,15 +26,15 @@
 		"magento-deploystrategy": "copy",
         "magento-force": true,
         "magento-deploy-sort-priority": {
-            "magento-hackathon/magento-composer-installer-test-sort1": "200",
-            "magento-hackathon/magento-composer-installer-test-sort2": "400",
-            "magento-hackathon/magento-composer-installer-test-sort3": "200"
+            "magento/magento-composer-installer-test-sort1": "200",
+            "magento/magento-composer-installer-test-sort2": "400",
+            "magento/magento-composer-installer-test-sort3": "200"
         },
         "auto-append-gitignore": true,
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/FullStackTest/magento-modules/composer_2.json b/tests/FullStackTest/magento-modules/composer_2.json
@@ -3,7 +3,7 @@
         "magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "2.*"
+        "magento/magento-composer-installer-test-update-file-remove": "2.*"
 	},
 	"repositories": [
 		{
@@ -17,7 +17,7 @@
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/FullStackTest/magento-modules/composer_2_copy.json b/tests/FullStackTest/magento-modules/composer_2_copy.json
@@ -3,7 +3,7 @@
         "magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "2.*"
+        "magento/magento-composer-installer-test-update-file-remove": "2.*"
 	},
 	"repositories": [
         {
@@ -17,7 +17,7 @@
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/FullStackTest/magento-modules/composer_2_copy_force.json b/tests/FullStackTest/magento-modules/composer_2_copy_force.json
@@ -3,7 +3,7 @@
         "magento/magento-composer-installer": "100.100.100",
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
-        "magento-hackathon/magento-composer-installer-test-update-file-remove": "2.*"
+        "magento/magento-composer-installer-test-update-file-remove": "2.*"
 	},
 	"repositories": [
         {
@@ -18,7 +18,7 @@
         "magento-project": {
             "libraryPath": "../htdocs/composer_lib/",
             "libraries": {
-                "magento-hackathon/magento-composer-installer-test-library": {}
+                "magento/magento-composer-installer-test-library": {}
             }
         },
 		"magento-root-dir": "../htdocs/"
diff --git a/tests/MagentoHackathon/Composer/Magento/FullStack/AbstractTest.php b/tests/MagentoHackathon/Composer/Magento/FullStack/AbstractTest.php
@@ -99,7 +99,7 @@ protected static function getProjectRoot(){
 
     protected static function getComposerCommand(){
 
-        return './composer.phar';
+        return 'composer.phar';
     }
 
     protected static function getComposerArgs(){
@@ -118,7 +118,7 @@ protected static function logProcessOutput(Process $process, $name = null){
             $name . '_Output.log'
         ]);
         if (!is_dir(dirname($logPath))) {
-            @mkdir(dirname($logPath));
+            mkdir(dirname($logPath));
         }
         file_put_contents(
             $logPath,
diff --git a/tests/MagentoHackathon/Composer/Magento/FullStackTest.php b/tests/MagentoHackathon/Composer/Magento/FullStackTest.php
@@ -27,7 +27,7 @@ public static function setUpBeforeClass(): void
         /** @var \DirectoryIterator $fileinfo */
         foreach($directory as $file){
             if (!$file->isDot() && $file->isDir()) {
-                $composerPath = self::getProjectRoot() . '/composer.phar';
+                $composerPath = self::getProjectRoot() . DIRECTORY_SEPARATOR . self::getComposerCommand();
                 $process = Process::fromShellCommandline(
                     $composerPath . ' archive --format=zip --dir="../../../../tests/FullStackTest/artifact" -vvv',
                     $file->getPathname()
@@ -63,8 +63,9 @@ protected function prepareCleanDirectories()
     protected function installBaseMagento()
     {
         $process = Process::fromShellCommandline(
-            '../../.././composer.phar install '.self::getComposerArgs().' --working-dir="./"',
-            self::getBasePath().'/magento'
+            self::getProjectRoot() . DIRECTORY_SEPARATOR . self::getComposerCommand() . ' install ' .
+            self::getComposerArgs() . ' --working-dir="./"',
+            self::getBasePath() . '/magento'
         );
         $process->setTimeout(300);
         $process->run();
@@ -207,7 +208,7 @@ protected function getFirstOnlyFileTestSet()
             'app/design/frontend/Magento/luma/Magento_ThemeMock/Foobar/issue76.phtml',
             'app/design/adminhtml/Magento/luma/Magento_AdminThemeMock/wildcard/wildcard.phtml',
             'composer_lib/autoload.php',
-            'composer_lib/magento-hackathon/magento-composer-installer-test-library/composer.json',
+            'composer_lib/magento/magento-composer-installer-test-library/composer.json',
 //            'app/design/frontend/test/default/updateFileRemove/design/test2.phtml',
         ];
     }
diff --git a/tests/MagentoHackathon/Composer/Magento/InstallerTest.php b/tests/MagentoHackathon/Composer/Magento/InstallerTest.php
@@ -81,10 +81,10 @@ protected function createPackageMock(array $extra = [], $name = 'example/test')
         $extraData = array_merge(['magento-root-dir' => $this->magentoDir], $extra);
 
         $package->method('getExtra')
-            ->will($this->returnValue($extraData));
+            ->willReturn($extraData);
         
         $package->method('getName')
-            ->will($this->returnValue($name));
+            ->willReturn($name);
 
         return $package;
     }
@@ -120,7 +120,7 @@ public function testGetParser( $packageExtra, $expectedClass, $composerExtra, $p
         
         $package = $this->createPackageMock( $packageExtra, $packageName );
         $prepareCallback($this->vendorDir);
-        $package->method('getType')->will($this->returnValue('magento2-library'));
+        $package->method('getType')->willReturn('magento2-library');
 
         $this->assertInstanceOf($expectedClass, $this->object->getParser($package));
     }
diff --git a/tests/res/packages/issue76/composer.json b/tests/res/packages/issue76/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-issue-87",
+    "name":"magento/magento-composer-installer-test-issue-87",
     "minimum-stability":"stable",
     "type":"magento2-theme",
     "version":"1.0.0",
diff --git a/tests/res/packages/library/composer.json b/tests/res/packages/library/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-library",
+    "name":"magento/magento-composer-installer-test-library",
     "minimum-stability":"stable",
     "autoload":{
         "classmap": [
diff --git a/tests/res/packages/sort1/composer.json b/tests/res/packages/sort1/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-sort1",
+    "name":"magento/magento-composer-installer-test-sort1",
     "minimum-stability":"stable",
     "type":"magento2-theme",
     "version":"1.0.0",
diff --git a/tests/res/packages/sort2/composer.json b/tests/res/packages/sort2/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-sort2",
+    "name":"magento/magento-composer-installer-test-sort2",
     "minimum-stability":"stable",
     "type":"magento2-theme",
     "version":"1.0.0",
diff --git a/tests/res/packages/sort3/composer.json b/tests/res/packages/sort3/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-sort3",
+    "name":"magento/magento-composer-installer-test-sort3",
     "minimum-stability":"stable",
     "type":"magento2-theme",
     "version":"1.0.0",
diff --git a/tests/res/packages/updateFileRemove_1/composer.json b/tests/res/packages/updateFileRemove_1/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-update-file-remove",
+    "name":"magento/magento-composer-installer-test-update-file-remove",
     "minimum-stability":"stable",
     "type":"magento-module",
     "version":"1.0.0"
diff --git a/tests/res/packages/updateFileRemove_2/composer.json b/tests/res/packages/updateFileRemove_2/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-update-file-remove",
+    "name":"magento/magento-composer-installer-test-update-file-remove",
     "minimum-stability":"stable",
     "type":"magento-module",
     "version":"2.0.0"
diff --git a/tests/res/packages/wildcard/composer.json b/tests/res/packages/wildcard/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-wildcard",
+    "name":"magento/magento-composer-installer-test-wildcard",
     "minimum-stability":"stable",
     "type":"magento2-theme",
     "version":"1.0.0",
diff --git a/tests/res/packages/wildcard2/composer.json b/tests/res/packages/wildcard2/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"magento-hackathon/magento-composer-installer-test-wildcard2",
+    "name":"magento/magento-composer-installer-test-wildcard2",
     "minimum-stability":"stable",
     "type":"magento-module",
     "version":"1.0.0"

Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,12 @@ public function createDelegate($source, $dest)`
`67`	`67`	`continue;`
`68`	`68`	`}`
`69`	`69`	`$childSource = $this->removeTrailingSlash($source) . DIRECTORY_SEPARATOR . $item;`
`70`		`- $this->create($childSource, substr($destPath, strlen($this->getDestDir())));`
	`70`	`+ $this->create($childSource, substr($destPath, strlen($this->getDestDir()) + 1));`
`71`	`71`	`}`
`72`	`72`	`return true;`
`73`	`73`	`} else {`
`74`	`74`	`$destPath = $this->removeTrailingSlash($destPath) . DIRECTORY_SEPARATOR . basename($source);`
`75`		`- return $this->create($source, substr($destPath, strlen($this->getDestDir())));`
	`75`	`+ return $this->create($source, substr($destPath, strlen($this->getDestDir()) + 1));`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ public function create($source, $dest)`
`287`	`287`	`foreach ($matches as $match) {`
`288`	`288`	`$newDest = substr($destPath . '/' . basename($match), strlen($this->getDestDir()));`
`289`	`289`	`$newDest = ltrim($newDest, ' \\/');`
`290`		`- $this->create(substr($match, strlen($this->getSourceDir())), $newDest);`
	`290`	`+ $this->create(substr($match, strlen($this->getSourceDir()) + 1), $newDest);`
`291`	`291`	`}`
`292`	`292`	`return true;`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"require": {`
`9`		`- "magento-hackathon/magento-composer-installer": "*"`
	`9`	`+ "magento/magento-composer-installer": "*"`
`10`	`10`	`},`
`11`	`11`	`"extra": {`
`12`	`12`	`"magento-root-dir": "root"`