Merge pull request #12 from magento-commerce/revert-11-AC-3684

Revert "AC-3684 Release magento components with symfony 5.4 support"

.gitattributes

@@ -3,5 +3,5 @@ composer.lock export-ignore
 build.xml export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-/dev export-ignore
+/tests export-ignore
 /doc export-ignore

.gitignore

@@ -4,4 +4,4 @@
 /composer.phar
 /composer.lock
 /vendor
-/dev/tests/FullStackTest/logs
+/tests/FullStackTest/logs

build.xml

@@ -0,0 +1,21 @@
+<project name="magento-composer-installer">
+    <target name="phpdoc">
+        <condition property="phpdoc" value="phpdoc.bat">
+            <os family="windows" />
+        </condition>
+        <property name="phpdoc" value="phpdoc" />
+
+        <exec executable="${phpdoc}">
+            <arg line="-d src -t doc --title=${ant.project.name}" />
+        </exec>
+    </target>
+
+    <target name="phpunit">
+        <condition property="phpunit" value="vendor/bin/phpunit.bat">
+            <os family="windows" />
+        </condition>
+        <property name="phpunit" value="vendor/bin/phpunit" />
+
+        <exec executable="${phpunit}" />
+    </target>
+</project>

composer.json

@@ -61,7 +61,7 @@
     "archive": {
         "exclude": [
             "vendor",
-            "dev"
+            "/tests/FullStackTest/"
         ]
     },
     "extra": {

phpunit.xml.dist

@@ -9,7 +9,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="dev/tests/bootstrap.php">
+         bootstrap="tests/bootstrap.php">
     <coverage>
         <include>
             <directory>./src/</directory>
@@ -18,7 +18,7 @@
     </coverage>
     <testsuites>
         <testsuite name="Magentohackathon Magento Installer Test Suite">
-            <directory>./dev/tests/MagentoHackathon</directory>
+            <directory>./tests/MagentoHackathon</directory>
         </testsuite>
     </testsuites>
     <groups>

dev/tests/MagentoHackathon/Composer/Magento/FullStack/AbstractTest.php → tests/MagentoHackathon/Composer/Magento/FullStack/AbstractTest.php

@@ -48,7 +48,7 @@ public static function setUpBeforeClass(): void
         @unlink(self::getBasePath().'/magento-modules/vendor/theseer/directoryscanner/tests/_data/nested/empty');
 
         $process = Process::fromShellCommandline(
-            self::getProjectRoot() . DIRECTORY_SEPARATOR  . self::getComposerCommand().' archive --format=zip --dir="dev/tests/FullStackTest/artifact" -vvv',
+            './' . self::getComposerCommand().' archive --format=zip --dir="tests/FullStackTest/artifact" -vvv',
             self::getProjectRoot()
         );
         $process->run();
@@ -94,7 +94,7 @@ protected static function getBasePath(){
     }
 
     protected static function getProjectRoot(){
-        return realpath(__DIR__.'/../../../../../..');
+        return realpath(__DIR__.'/../../../../..');
     }
 
     protected static function getComposerCommand(){
@@ -107,7 +107,7 @@ protected static function getComposerArgs(){
     }
 
     protected static function logProcessOutput(Process $process, $name = null){
-        if ($name === null) {
+        if($name === null) {
             $name = self::$processLogCounter;
             self::$processLogCounter++;
         }

dev/tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php → tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php

@@ -30,7 +30,7 @@ protected function prepareCleanDirectories()
     public function testGlobalInstall()
     {
         $process = Process::fromShellCommandline(
-            self::getProjectRoot() . DIRECTORY_SEPARATOR . self::getComposerCommand() . ' global install',
+            './' . self::getComposerCommand() . ' global install',
             self::getProjectRoot(),
             ['COMPOSER_HOME' => self::getBasePath() . '/home']
         );
@@ -42,7 +42,7 @@ public function testGlobalInstall()
     public function testGlobalUpdate()
     {
         $process = Process::fromShellCommandline(
-            self::getProjectRoot() . DIRECTORY_SEPARATOR . self::getComposerCommand() . ' global update',
+            './' . self::getComposerCommand() . ' global update',
             self::getProjectRoot(),
             ['COMPOSER_HOME' => self::getBasePath() . '/home']
         );

dev/tests/MagentoHackathon/Composer/Magento/FullStackTest.php → tests/MagentoHackathon/Composer/Magento/FullStackTest.php

@@ -22,7 +22,7 @@ protected function tearDown(): void
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        $packagesPath    = self::getProjectRoot() .'/dev/tests/res/packages';
+        $packagesPath    = self::getProjectRoot() .'/tests/res/packages';
         $directory = new \DirectoryIterator($packagesPath);
         /** @var \DirectoryIterator $fileinfo */
         foreach($directory as $file){
@@ -190,7 +190,7 @@ protected function changeModuleComposerFileAndUpdate($file, $command = "update")
             $magentoModuleComposerFile
         );
 
-        $composerPath = self::getProjectRoot() . DIRECTORY_SEPARATOR . self::getComposerCommand();
+        $composerPath = '../../.././composer.phar';
         $process = Process::fromShellCommandline(
             $composerPath . ' ' . $command. ' '. self::getComposerArgs().' --optimize-autoloader --working-dir="./"',
             self::getBasePath() . '/magento-modules'

tests/bootstrap.php

@@ -0,0 +1,5 @@
+<?php
+
+// Set up autoloading
+require_once __DIR__ . '/../vendor/autoload.php';
+