added schema-filename-mask argument to console command

oliwierptak · Nov 16, 2021 · e244bc9 · e244bc9
1 parent cead134
commit e244bc9
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -111,7 +111,8 @@ You can either use it as composer dependency or as docker command.
         -o [output-path] \
         -nm [namespace] \
         -nr [namespace-root] \
-        -p [schema-path-filter]
+        -p [schema-path-filter] \
+        -m [schema-filename-mask]
       ```
    - with docker
       ```sh
@@ -120,7 +121,8 @@ You can either use it as composer dependency or as docker command.
         -o [output-path] \
         -nm [namespace] \
         -nr [namespace-root] \
-        -p [schema-path-filter]     
+        -p [schema-path-filter] \
+        -m [schema-filename-mask]     
      ```
 
 
@@ -186,6 +188,13 @@ Each schema folder can contain multiple schema files, for example:
 _Run `bin/popo generate -s tests/fixtures/ -p bundles -c tests/fixtures/bundles/project.config.yml` or `docker-popo generate -s tests/fixtures/ -p bundles -c tests/fixtures/bundles/project.config.yml` to generate files from this example._
 
 
+### `[schema-filename-mask]`
+
+Filename mask used to locate schema files when using `schema-path-filter`.
+
+Default is `*.popo.yml`.
+
+
 ### Report Command
 
 The `report` command shows list of defined / inherited properties.

diff --git a/src/Popo/Command/GenerateCommand.php b/src/Popo/Command/GenerateCommand.php
@@ -20,6 +20,8 @@ class GenerateCommand extends AbstractCommand
 
     public const OPTION_SCHEMA_CONFIG_FILENAME = 'schemaConfigFilename';
 
+    public const OPTION_SCHEMA_FILENAME_MASK = 'schemaFilenameMask';
+
     public const OPTION_OUTPUT_PATH = 'outputPath';
 
     public const OPTION_NAMESPACE = 'namespace';
@@ -74,7 +76,14 @@ protected function configure(): void
                         InputOption::VALUE_OPTIONAL,
                         'Path filter to match POPO schema files.',
                         null
-                    )
+                    ),
+                    new InputOption(
+                        static::OPTION_SCHEMA_FILENAME_MASK,
+                        'm',
+                        InputOption::VALUE_OPTIONAL,
+                        'Schema filename mask.',
+                        '*.popo.yml'
+                    ),
                 ]
             );
     }
@@ -116,14 +125,25 @@ protected function buildConfigurator(InputInterface $input): PopoConfigurator
                 $input->hasOption(static::OPTION_NAMESPACE) ? $input->getOption(static::OPTION_NAMESPACE) : null
             )
             ->setNamespaceRoot(
-                $input->hasOption(static::OPTION_NAMESPACE_ROOT) ? $input->getOption(static::OPTION_NAMESPACE_ROOT) : null
+                $input->hasOption(static::OPTION_NAMESPACE_ROOT) ? $input->getOption(
+                    static::OPTION_NAMESPACE_ROOT
+                ) : null
             )
-            ->setSchemaPath((string)$input->getOption(static::OPTION_SCHEMA_PATH))
+            ->setSchemaPath((string) $input->getOption(static::OPTION_SCHEMA_PATH))
             ->setSchemaPathFilter(
-                $input->hasOption(static::OPTION_SCHEMA_PATH_FILTER) ? $input->getOption(static::OPTION_SCHEMA_PATH_FILTER) : null
+                $input->hasOption(static::OPTION_SCHEMA_PATH_FILTER) ? $input->getOption(
+                    static::OPTION_SCHEMA_PATH_FILTER
+                ) : null
             )
             ->setSchemaConfigFilename(
-                $input->hasOption(static::OPTION_SCHEMA_CONFIG_FILENAME) ? $input->getOption(static::OPTION_SCHEMA_CONFIG_FILENAME) : null
+                $input->hasOption(static::OPTION_SCHEMA_CONFIG_FILENAME) ? $input->getOption(
+                    static::OPTION_SCHEMA_CONFIG_FILENAME
+                ) : null
+            )
+            ->setSchemaFilenameMask(
+                $input->hasOption(static::OPTION_SCHEMA_FILENAME_MASK) ? $input->getOption(
+                    static::OPTION_SCHEMA_FILENAME_MASK
+                ) : '*.popo.yml'
             );
     }
 }
diff --git a/src/Popo/Loader/SchemaLoader.php b/src/Popo/Loader/SchemaLoader.php
@@ -86,7 +86,7 @@ protected function loadSchemaFiles(PopoConfigurator $configurator): array
             $files = $this->fileLocator->locate(
                 $configurator->getSchemaPath(),
                 (string) $configurator->getSchemaPathFilter(),
-                $configurator->getSchemaFilename()
+                $configurator->getSchemaFilenameMask()
             );
         }
 

diff --git a/src/Popo/PopoConfigurator.php b/src/Popo/PopoConfigurator.php
@@ -11,7 +11,7 @@ class PopoConfigurator
     protected ?string $outputPath = null;
     protected string $schemaPath;
     protected ?string $schemaPathFilter = null;
-    protected ?string $schemaFilename = '*.popo.yml';
+    protected ?string $schemaFilenameMask = '*.popo.yml';
     protected ?string $schemaConfigFilename = null;
 
     public function getNamespace(): ?string
@@ -74,14 +74,14 @@ public function setSchemaPathFilter(?string $schemaPathFilter): self
         return $this;
     }
 
-    public function getSchemaFilename(): ?string
+    public function getSchemaFilenameMask(): ?string
     {
-        return $this->schemaFilename;
+        return $this->schemaFilenameMask;
     }
 
-    public function setSchemaFilename(string $schemaFilename): self
+    public function setSchemaFilenameMask(string $schemaFilenameMask): self
     {
-        $this->schemaFilename = $schemaFilename;
+        $this->schemaFilenameMask = $schemaFilenameMask;
 
         return $this;
     }

diff --git a/tests/suite/Popo/Command/GenerateCommandTest.php b/tests/suite/Popo/Command/GenerateCommandTest.php
@@ -36,6 +36,7 @@ public function test_command_params(): void
                 '--outputPath' => POPO_TESTS_DIR,
                 '--schemaPathFilter' => 'bundles',
                 '--schemaConfigFilename' => POPO_TESTS_DIR . 'fixtures/bundles/project.config.yml',
+                '--schemaFilenameMask' => '*.popo.yml',
             ]
         );
 
@@ -53,6 +54,7 @@ public function test_generate_from_path(): void
                 '--outputPath' => POPO_TESTS_DIR,
                 '--schemaPathFilter' => 'bundles',
                 '--schemaConfigFilename' => POPO_TESTS_DIR . 'fixtures/bundles/project.config.yml',
+                '--schemaFilenameMask' => '*.popo.yml',
             ]
         );
 

diff --git a/tests/suite/Popo/PopoConfiguratorTest.php b/tests/suite/Popo/PopoConfiguratorTest.php
@@ -9,8 +9,8 @@ class PopoConfiguratorTest extends TestCase
 {
     public function testSetSchemaFilename()
     {
-        $configurator = (new PopoConfigurator)->setSchemaFilename('*.schema.yml');
+        $configurator = (new PopoConfigurator)->setSchemaFilenameMask('*.schema.yml');
 
-        $this->assertEquals('*.schema.yml', $configurator->getSchemaFilename());
+        $this->assertEquals('*.schema.yml', $configurator->getSchemaFilenameMask());
     }
 }