Merge pull request #20 from PackageFactory/countable-and-eager-transl…

…ator Countable and eager translator
PackageFactory · Jul 20, 2021 · 4267508 · 4267508
2 parents 4200cac + 3eb9aaf
commit 4267508
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 8 deletions.
diff --git a/Classes/Application/PseudoEnumProvider.php b/Classes/Application/PseudoEnumProvider.php
@@ -19,7 +19,7 @@
 final class PseudoEnumProvider extends AbstractDataSource implements ProtectedContextAwareInterface, NodeTypePostprocessorInterface
 {
     /**
-     * @Flow\Inject
+     * @Flow\Inject(lazy=false)
      * @var Translator
      */
     protected $translator;

diff --git a/Classes/Domain/Component/Component.php b/Classes/Domain/Component/Component.php
@@ -127,7 +127,7 @@ public function getComponentArrayContent(): string
 /**
  * @Flow\Proxy(false)
  */
-final class ' . $this->name->getSimpleComponentArrayName() . ' implements \IteratorAggregate
+final class ' . $this->name->getSimpleComponentArrayName() . ' implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,' . $this->name->getSimpleInterfaceName() . '>|' . $this->name->getSimpleInterfaceName() . '[]
@@ -151,6 +151,11 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->' . $this->name->getSimpleComponentArrayPropertyName() . ');
     }
+
+    public function count(): int
+    {
+        return count($this->' . $this->name->getSimpleComponentArrayPropertyName() . ');
+    }
 }
 ';
     }

diff --git a/Tests/Unit/Domain/Component/ComponentTest.php b/Tests/Unit/Domain/Component/ComponentTest.php
@@ -419,7 +419,7 @@ public function testGetComponentArrayContent(): void
 /**
  * @Flow\Proxy(false)
  */
-final class MyNewComponents implements \IteratorAggregate
+final class MyNewComponents implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,MyNewComponentInterface>|MyNewComponentInterface[]
@@ -443,6 +443,11 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->myNewComponents);
     }
+
+    public function count(): int
+    {
+        return count($this->myNewComponents);
+    }
 }
 ',
             $this->subject->getComponentArrayContent()

diff --git a/...napshots__/ComponentGeneratorTest__generatesComponents with data set textWithArray__2.txt b/...napshots__/ComponentGeneratorTest__generatesComponents with data set textWithArray__2.txt
@@ -10,7 +10,7 @@ use Neos\Flow\Annotations as Flow;
 /**
  * @Flow\Proxy(false)
  */
-final class NewTexts implements \IteratorAggregate
+final class NewTexts implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,NewTextInterface>|NewTextInterface[]
@@ -34,4 +34,9 @@ final class NewTexts implements \IteratorAggregate
     {
         return new \ArrayIterator($this->newTexts);
     }
+
+    public function count(): int
+    {
+        return count($this->newTexts);
+    }
 }
diff --git a/Tests/Unit/Fixtures/Shared/Presentation/Component/Text/Texts.php b/Tests/Unit/Fixtures/Shared/Presentation/Component/Text/Texts.php
@@ -11,7 +11,7 @@
  * A list of texts
  * @Flow\Proxy(false)
  */
-final class Texts implements \IteratorAggregate
+final class Texts implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,TextInterface>|TextInterface[]
@@ -36,4 +36,9 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->texts);
     }
+
+    public function count(): int
+    {
+        return count($this->texts);
+    }
 }
diff --git a/Tests/Unit/Fixtures/Site/Presentation/Component/AnotherComponent/AnotherComponents.php b/Tests/Unit/Fixtures/Site/Presentation/Component/AnotherComponent/AnotherComponents.php
@@ -11,7 +11,7 @@
  * A list of anotherComponents
  * @Flow\Proxy(false)
  */
-final class AnotherComponents implements \IteratorAggregate
+final class AnotherComponents implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,AnotherComponentInterface>|AnotherComponentInterface[]
@@ -35,4 +35,9 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->anotherComponents);
     }
+
+    public function count(): int
+    {
+        return count($this->anotherComponents);
+    }
 }
diff --git a/Tests/Unit/Fixtures/Site/Presentation/Component/MyComponent/MyComponents.php b/Tests/Unit/Fixtures/Site/Presentation/Component/MyComponent/MyComponents.php
@@ -11,7 +11,7 @@
  * A list of myComponents
  * @Flow\Proxy(false)
  */
-final class MyComponents implements \IteratorAggregate
+final class MyComponents implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,MyComponentInterface>|MyComponentInterface[]
@@ -35,4 +35,9 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->myComponents);
     }
+
+    public function count(): int
+    {
+        return count($this->myComponents);
+    }
 }
diff --git a/Tests/Unit/Fixtures/Site/Presentation/Component/Text/Texts.php b/Tests/Unit/Fixtures/Site/Presentation/Component/Text/Texts.php
@@ -12,7 +12,7 @@
  * A list of texts
  * @Flow\Proxy(false)
  */
-final class Texts implements \IteratorAggregate
+final class Texts implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<int,TextInterface>|TextInterface[]
@@ -36,4 +36,9 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->texts);
     }
+
+    public function count(): int
+    {
+        return count($this->texts);
+    }
 }