Merged ComposerScriptDependencyFinder and ComposerDependencyFinder, u…

…pdated detecting CodeSniffer dependencies. (#6132)
spryker · Oct 8, 2019 · c8f574a · c8f574a
1 parent 6dbd2a3
commit c8f574a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 70 deletions.
diff --git a/...Spryker/Zed/Development/Business/Dependency/DependencyFinder/ComposerDependencyFinder.php b/...Spryker/Zed/Development/Business/Dependency/DependencyFinder/ComposerDependencyFinder.php
@@ -49,7 +49,12 @@ public function accept(DependencyFinderContextInterface $context): bool
     public function findDependencies(DependencyFinderContextInterface $context, DependencyContainerInterface $dependencyContainer): DependencyContainerInterface
     {
         $fileContent = $context->getFileInfo()->getContents();
-        if (preg_match('/code-sniffer\/(Spryker|SprykerStrict)\/ruleset.xml/', $fileContent)) {
+
+        if (strpos($fileContent, 'cs-check') !== false) {
+            $dependencyContainer->addDependency('CodeSniffer', $this->getType(), false, true);
+        }
+
+        if (preg_match('/code-sniffer\/(Spryker|SprykerStrict)/', $fileContent)) {
             $dependencyContainer->addDependency('CodeSniffer', $this->getType(), false, true);
         }
 

diff --git a/...r/Zed/Development/Business/Dependency/DependencyFinder/ComposerScriptDependencyFinder.php b/...r/Zed/Development/Business/Dependency/DependencyFinder/ComposerScriptDependencyFinder.php
diff --git a/...c/Spryker/Zed/Development/Business/Dependency/DependencyFinder/TravisDependencyFinder.php b/...c/Spryker/Zed/Development/Business/Dependency/DependencyFinder/TravisDependencyFinder.php
@@ -49,7 +49,12 @@ public function accept(DependencyFinderContextInterface $context): bool
     public function findDependencies(DependencyFinderContextInterface $context, DependencyContainerInterface $dependencyContainer): DependencyContainerInterface
     {
         $fileContent = $context->getFileInfo()->getContents();
-        if (preg_match('/code-sniffer\/(Spryker|SprykerStrict)\/ruleset.xml/', $fileContent)) {
+
+        if (preg_match('/composer cs-check/', $fileContent)) {
+            $dependencyContainer->addDependency('CodeSniffer', $this->getType(), false, true);
+        }
+
+        if (preg_match('/code-sniffer\/(Spryker|SprykerStrict)/', $fileContent)) {
             $dependencyContainer->addDependency('CodeSniffer', $this->getType(), false, true);
         }
 

diff --git a/Bundles/Development/src/Spryker/Zed/Development/Business/DevelopmentBusinessFactory.php b/Bundles/Development/src/Spryker/Zed/Development/Business/DevelopmentBusinessFactory.php
@@ -47,7 +47,6 @@
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\BehaviorDependencyFinder;
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\CodeceptionDependencyFinder;
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\ComposerDependencyFinder;
-use Spryker\Zed\Development\Business\Dependency\DependencyFinder\ComposerScriptDependencyFinder;
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\DependencyFinderComposite;
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\DependencyFinderInterface;
 use Spryker\Zed\Development\Business\Dependency\DependencyFinder\ExtensionDependencyFinder;
@@ -401,7 +400,6 @@ public function createDependencyFinder(): DependencyFinderInterface
             $this->createTwigDependencyFinder(),
             $this->createComposerDependencyFinder(),
             $this->createTravisDependencyFinder(),
-            $this->createComposerScriptDependencyFinder(),
             $this->createCodeceptionDependencyFinder(),
             $this->createModuleAnnotationDependencyFinder(),
         ]);
@@ -522,14 +520,6 @@ public function createTravisDependencyFinder(): DependencyFinderInterface
         return new TravisDependencyFinder();
     }
 
-    /**
-     * @return \Spryker\Zed\Development\Business\Dependency\DependencyFinder\DependencyFinderInterface
-     */
-    public function createComposerScriptDependencyFinder(): DependencyFinderInterface
-    {
-        return new ComposerScriptDependencyFinder();
-    }
-
     /**
      * @return \Spryker\Zed\Development\Business\Dependency\DependencyFinder\DependencyFinderInterface
      */