🧑‍💻 improve standalone ci task

✨ add new directory path pattern for standalone ci tasks (#11) :recycle: some refactoring for removing duplicated code :hammer: add phpcbf to make file
fond-of · Mar 23, 2022 · 51a0dd8 · 51a0dd8
1 parent e116bcc
commit 51a0dd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,10 @@ install:
 phpcs:
 	./vendor/bin/phpcs --standard=./vendor/spryker/code-sniffer/Spryker/ruleset.xml ./src/FondOfCodeception/* ./src/Propel/ ./tests/FondOfCodeception/* ./tests/Propel/
 
+.PHONY: phpcbf
+phpcbf:
+	./vendor/bin/phpcbf --standard=./vendor/spryker/code-sniffer/Spryker/ruleset.xml ./src/FondOfCodeception/* ./src/Propel/ ./tests/FondOfCodeception/* ./tests/Propel/
+
 .PHONY: codeception
 codeception:
 	./vendor/bin/codecept run --coverage --coverage-xml --coverage-html

diff --git a/src/FondOfCodeception/Lib/SearchFacadeFactory.php b/src/FondOfCodeception/Lib/SearchFacadeFactory.php
@@ -225,21 +225,25 @@ protected function createSearchElasticsearchBusinessFactory(): AbstractBusinessF
     protected function createSearchElasticsearchConfig(): SearchElasticsearchConfig
     {
         $searchElasticsearchConfig = new class extends SearchElasticsearchConfig {
+            /** @var array */
+            protected const POSSIBLE_DIRECTORY_PATTERNS = [
+                '%s/vendor/*/*/src/*/Shared/*/Schema/',
+                '%s/*/*/src/*/Shared/*/Schema/',
+                '%s/src/*/Shared/*/Schema/',
+            ];
+
             /**
              * @return array
              */
             public function getJsonSchemaDefinitionDirectories(): array
             {
                 $directories = [];
 
-                $directory = sprintf('%s/vendor/*/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR);
-                if (glob($directory, GLOB_NOSORT | GLOB_ONLYDIR)) {
-                    $directories[] = $directory;
-                }
-
-                $directory = sprintf('%s/*/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR);
-                if (glob($directory, GLOB_NOSORT | GLOB_ONLYDIR)) {
-                    $directories[] = $directory;
+                foreach (static::POSSIBLE_DIRECTORY_PATTERNS as $possibleDirectoryPattern) {
+                    $directory = sprintf($possibleDirectoryPattern, APPLICATION_ROOT_DIR);
+                    if (glob($directory, GLOB_NOSORT | GLOB_ONLYDIR)) {
+                        $directories[] = $directory;
+                    }
                 }
 
                 return $directories;