Merge pull request #17 from rayanlevert/feature/enum-options

Arguments\Option : Enumeration to describe all defined options for an Argument

.github/workflows/ci.yml → .github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-# Inspired by Sebastian Bergmann's phpunit action workflow https://github.com/sebastianbergmann/phpunit/blob/main/.github/workflows/ci.yml
+# Inspired by Sebastian Bergmann's phpunit action workflow https://github.com/sebastianbergmann/phpunit/blob/main/.github/workflows/ci.yaml
 
 name: "CI"
 
@@ -97,6 +97,7 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
 
         steps:
             - name: Checkout

docker-compose.yml

@@ -1,21 +1,5 @@
-version: '2'
-
 services:
-  cli-8.1:
-    build: docker/8.1
-    restart: 'no'
-    working_dir: /app
-    volumes:
-      - .:/app
-
-  cli-8.2:
-    build: docker/8.2
-    restart: 'no'
-    working_dir: /app
-    volumes:
-      - .:/app
-
-  cli-8.3:
+  cli:
     build: docker/8.3
     restart: 'no'
     working_dir: /app

docker/8.3/Dockerfile

@@ -1,5 +1,5 @@
-FROM composer:2.6.5 AS composer
-FROM php:8.3-fpm
+FROM composer:2.7.7 AS composer
+FROM php:8.3-cli
 
 LABEL maintainer="Rayan Levert <[email protected]>"
 

src/Arguments.php

@@ -23,7 +23,7 @@
  *
  * @implements \IteratorAggregate<string, Argument>
  */
-class Arguments implements \IteratorAggregate
+class Arguments implements \IteratorAggregate, \Countable
 {
     /**
      * @var array<string, Argument>
@@ -43,11 +43,11 @@ public function __construct(Argument ...$oArguments)
     }
 
     /**
-     * @return \Traversable<string, Argument>
+     * @return \Generator<string, Argument>
      */
-    public function getIterator(): \Traversable
+    public function getIterator(): \Generator
     {
-        return new \ArrayIterator($this->data);
+        yield from $this->data;
     }
 
     /**
@@ -121,7 +121,7 @@ public function parse(string ...$arguments): void
         }
 
         // Loops to recover required arguments and set their values
-        foreach ($this->data as $name => $oArgument) {
+        foreach ($this as $name => $oArgument) {
             if (!$oArgument->isRequired()) {
                 continue;
             }
@@ -171,7 +171,7 @@ public function getRequired(): self
 
         $oSelf = new self();
 
-        foreach ($this->data as $oArgument) {
+        foreach ($this as $oArgument) {
             if ($oArgument->isRequired()) {
                 $oSelf->set($oArgument);
             }
@@ -215,7 +215,7 @@ public function printArguments(): void
      */
     protected function getByShortPrefix(string $name): ?Argument
     {
-        foreach ($this->data as $oArgument) {
+        foreach ($this as $oArgument) {
             if ($oArgument->getPrefix() === $name) {
                 return $oArgument;
             }
@@ -229,7 +229,7 @@ protected function getByShortPrefix(string $name): ?Argument
      */
     protected function getByLongPrefix(string $name): ?Argument
     {
-        foreach ($this->data as $oArgument) {
+        foreach ($this as $oArgument) {
             if ($oArgument->getLongPrefix() === $name) {
                 return $oArgument;
             }
@@ -245,7 +245,7 @@ protected function getNotHandled(): self
     {
         $oSelf = new self();
 
-        foreach ($this->data as $oArgument) {
+        foreach ($this as $oArgument) {
             if (!$oArgument->hasBeenHandled()) {
                 $oSelf->set($oArgument);
             }
@@ -269,7 +269,7 @@ protected function assertOrderRequired(): void
     {
         $argHasNotRequired = false;
 
-        foreach ($this->data as $name => $oArgument) {
+        foreach ($this as $name => $oArgument) {
             if ($oArgument->getPrefix() || $oArgument->getLongPrefix()) {
                 continue;
             }