SDK-2546: Fixed issue with cs & paths

spryker-sdk · Aug 19, 2023 · 9343d22 · 9343d22
1 parent eddd31f
commit 9343d22
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/Builder/ClassLoader/ClassLoader.php b/src/Builder/ClassLoader/ClassLoader.php
@@ -78,7 +78,7 @@ public function loadClass(string $className): ClassInformationTransfer
         $classInformationTransfer->setClassTokenTree($syntaxTree)
             ->setOriginalClassTokenTree($originalSyntaxTree)
             ->setTokens($this->lexer->getTokens())
-            ->setFilePath($fileName);
+            ->setFilePath(realpath($fileName));
 
         $parentClass = $this->getParent($syntaxTree);
         if ($parentClass) {

diff --git a/src/Builder/FileNormalizer/PhpCSFixerFileNormalizer.php b/src/Builder/FileNormalizer/PhpCSFixerFileNormalizer.php
@@ -61,9 +61,11 @@ public function normalize(array $filePaths): void
         $process = $this->processExecutor->execute($command);
 
         // TODO remove when phpcbf will be able to fix all issues in file during the one iteration
-        if (defined('TEST_INTEGRATOR_MODE') && TEST_INTEGRATOR_MODE === 'true') {
-            \sleep(3);
+        if (defined('TEST_INTEGRATOR_MODE') && TEST_INTEGRATOR_MODE === 'true' && $process->getExitCode() !== 0) {
             $process = $this->processExecutor->execute($command);
+            if ($process->getExitCode() !== 0) {
+                $process = $this->processExecutor->execute($command);
+            }
         }
 
         if ($process->getExitCode() > 0 && $process->getErrorOutput() !== '') {

diff --git a/tests/SprykerSdkTest/Integrator/IntegratorFacadeTest.php b/tests/SprykerSdkTest/Integrator/IntegratorFacadeTest.php
@@ -12,9 +12,6 @@
 use SprykerSdk\Integrator\Dependency\Console\InputOutputInterface;
 use SprykerSdk\Integrator\Dependency\Console\SymfonyConsoleInputOutputAdapter;
 
-/**
- * @group test1
- */
 class IntegratorFacadeTest extends AbstractIntegratorTestCase
 {
     /**
@@ -52,6 +49,7 @@ public function testRunInstallationConfigureModule(): void
     }
 
     /**
+     * @group test1
      * @return void
      */
     public function testRunInstallationWirePlugin(): void
@@ -121,7 +119,6 @@ public function testRunInstallationWireSchema(): void
     }
 
     /**
-     * @group test2
      * @return void
      */
     public function testRunInstallationUnwirePlugin(): void

diff --git a/tests/_data/archive.zip b/tests/_data/archive.zip