Merge pull request #317 from FriendsOfCake/issue-315

Remove "Filter" from baked collections.
FriendsOfCake · Feb 16, 2022 · 760d996 · 760d996
2 parents 1ef5fe9 + 22f8411
commit 760d996
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/Command/Bake/FilterCollectionCommand.php b/src/Command/Bake/FilterCollectionCommand.php
@@ -167,7 +167,7 @@ public function name(): string
      */
     public function fileName(string $name): string
     {
-        return $name . 'FilterCollection.php';
+        return $name . 'Collection.php';
     }
 
     /**

diff --git a/templates/bake/FilterCollection/filter_collection.twig b/templates/bake/FilterCollection/filter_collection.twig
@@ -5,7 +5,7 @@ namespace {{ namespace }};
 
 use Search\Model\Filter\FilterCollection;
 
-class {{ name }}FilterCollection extends FilterCollection
+class {{ name }}Collection extends FilterCollection
 {
     /**
      * @return void

diff --git a/tests/TestCase/Command/Bake/FilterCollectionCommandTest.php b/tests/TestCase/Command/Bake/FilterCollectionCommandTest.php
@@ -68,7 +68,7 @@ public function testEmpty()
 
         $this->assertExitCode(BaseCommand::CODE_SUCCESS);
 
-        $file = $this->_generatedBasePath . 'EmptyFilterCollection.php';
+        $file = $this->_generatedBasePath . 'EmptyCollection.php';
         $result = file_get_contents($file);
         $this->assertSameAsFile(__FUNCTION__ . '.php', $result);
     }
@@ -82,7 +82,7 @@ public function testDefault()
 
         $this->assertExitCode(BaseCommand::CODE_SUCCESS);
 
-        $file = $this->_generatedBasePath . 'PostsFilterCollection.php';
+        $file = $this->_generatedBasePath . 'PostsCollection.php';
         $result = file_get_contents($file);
         $this->assertSameAsFile(__FUNCTION__ . '.php', $result);
     }
@@ -96,7 +96,7 @@ public function testCustomName()
 
         $this->assertExitCode(BaseCommand::CODE_SUCCESS);
 
-        $file = $this->_generatedBasePath . 'MyPostsFilterCollection.php';
+        $file = $this->_generatedBasePath . 'MyPostsCollection.php';
         $result = file_get_contents($file);
         $this->assertSameAsFile(__FUNCTION__ . '.php', $result);
     }
@@ -110,7 +110,7 @@ public function testPrefix()
 
         $this->assertExitCode(BaseCommand::CODE_SUCCESS);
 
-        $file = $this->_generatedBasePath . 'Admin/PrefixedPostsFilterCollection.php';
+        $file = $this->_generatedBasePath . 'Admin/PrefixedPostsCollection.php';
         $result = file_get_contents($file);
         $this->assertSameAsFile(__FUNCTION__ . '.php', $result);
     }

diff --git a/tests/comparisons/Filter/testCustomName.php b/tests/comparisons/Filter/testCustomName.php
@@ -5,7 +5,7 @@
 
 use Search\Model\Filter\FilterCollection;
 
-class MyPostsFilterCollection extends FilterCollection
+class MyPostsCollection extends FilterCollection
 {
     /**
      * @return void

diff --git a/tests/comparisons/Filter/testDefault.php b/tests/comparisons/Filter/testDefault.php
@@ -5,7 +5,7 @@
 
 use Search\Model\Filter\FilterCollection;
 
-class PostsFilterCollection extends FilterCollection
+class PostsCollection extends FilterCollection
 {
     /**
      * @return void

diff --git a/tests/comparisons/Filter/testEmpty.php b/tests/comparisons/Filter/testEmpty.php
@@ -5,7 +5,7 @@
 
 use Search\Model\Filter\FilterCollection;
 
-class EmptyFilterCollection extends FilterCollection
+class EmptyCollection extends FilterCollection
 {
     /**
      * @return void

diff --git a/tests/comparisons/Filter/testPrefix.php b/tests/comparisons/Filter/testPrefix.php
@@ -5,7 +5,7 @@
 
 use Search\Model\Filter\FilterCollection;
 
-class PrefixedPostsFilterCollection extends FilterCollection
+class PrefixedPostsCollection extends FilterCollection
 {
     /**
      * @return void