Added test directory check

Author: shudd3r

src/Fixer/MultiOrderedClassElementsFixer.php

@@ -20,15 +20,18 @@
 
 class MultiOrderedClassElementsFixer implements FixerInterface
 {
+    private string                    $testPath;
     private OrderedClassElementsFixer $srcFixer;
     private OrderedClassElementsFixer $testFixer;
 
     /**
-     * @param array $srcOrder
-     * @param array $testOrder
+     * @param string $testPath
+     * @param array  $srcOrder
+     * @param array  $testOrder
      */
-    public function __construct(array $srcOrder, array $testOrder)
+    public function __construct(string $testPath, array $srcOrder, array $testOrder)
     {
+        $this->testPath  = $testPath;
         $this->srcFixer  = new OrderedClassElementsFixer();
         $this->testFixer = new OrderedClassElementsFixer();
 
@@ -58,7 +61,7 @@ public function isRisky(): bool
 
     public function fix(SplFileInfo $file, Tokens $tokens): void
     {
-        $this->isTestClass($tokens)
+        strpos($file->getPathname(), $this->testPath) === 0 && $this->isTestClass($tokens)
             ? $this->testFixer->fix($file, $tokens)
             : $this->srcFixer->fix($file, $tokens);
     }

src/FixerFactory.php

@@ -76,6 +76,7 @@ final class FixerFactory
     public static function createFor(string $launchFile): Config
     {
         $workingDir = dirname($launchFile);
+        $testsPath  = $workingDir . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR;
 
         self::setHeaderFrom($launchFile);
 
@@ -114,9 +115,8 @@ public static function createFor(string $launchFile): Config
         self::$rules['Polymorphine/declare_strict_first_line']               = true;
         self::$rules['Polymorphine/brace_after_multiline_param_method']      = true;
 
-        $excludeSamples = function (SplFileInfo $file) use ($workingDir) {
+        $excludeSamples = function (SplFileInfo $file) use ($testsPath) {
             $filePath   = $file->getPath();
-            $testsPath  = $workingDir . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR;
             $samplesDir = DIRECTORY_SEPARATOR . 'code-samples' . DIRECTORY_SEPARATOR;
             return strpos($filePath, $testsPath) !== 0 || strpos($filePath, $samplesDir) === false;
         };
@@ -130,7 +130,7 @@ public static function createFor(string $launchFile): Config
             ->registerCustomFixers([
                 new Fixer\DoubleLineBeforeClassDefinitionFixer(),
                 new Fixer\NoTrailingCommaInMultilineArrayFixer(),
-                new Fixer\MultiOrderedClassElementsFixer($srcOrder, $testOrder),
+                new Fixer\MultiOrderedClassElementsFixer($testsPath, $srcOrder, $testOrder),
                 new Fixer\NamedConstructorsFirstStaticFixer(),
                 new Fixer\AlignedMethodChainFixer(),
                 new Fixer\AlignedAssignmentsFixer(),

tests/Fixer/MultiOrderedClassElementsFixerTest.php

@@ -184,7 +184,7 @@ protected function fixer(): FixerInterface
             'method_private', 'method_private_static'
         ];
 
-        return new MultiOrderedClassElementsFixer($srcOrder, $testOrder);
+        return new MultiOrderedClassElementsFixer(dirname(__DIR__, 2), $srcOrder, $testOrder);
     }
 
     protected function properties(): array