Merge remote-tracking branch 'origin/main'

Author: carloscarucce

.github/workflows/php.yml

@@ -0,0 +1,39 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    - name: Run test suite
+      run: composer run-script test

src/Annotations/Inject.php

@@ -9,7 +9,6 @@ class Inject
 {
     public function __construct(
         public readonly ?string $index = null
-    )
-    {
+    ) {
     }
 }

src/Annotations/Provides.php

@@ -9,7 +9,6 @@ class Provides
 {
     public function __construct(
         public readonly string $index
-    )
-    {
+    ) {
     }
 }

src/Exceptions/ContainerException.php

@@ -7,5 +7,4 @@
 
 class ContainerException extends Exception implements ContainerExceptionInterface
 {
-
 }

src/Exceptions/NotFoundException.php

@@ -7,5 +7,4 @@
 
 class NotFoundException extends Exception implements NotFoundExceptionInterface
 {
-
 }

src/ServiceContainer.php

@@ -71,10 +71,10 @@ public function addAlias(string $alias, string $concrete): void
      *
      * @param T $id Identifier of the entry to look for.
      *
-     * @return T
      * @throws ContainerExceptionInterface Error while retrieving the entry.
-     *
      * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
+     *
+     * @return T
      */
     public function get(string $id): mixed
     {
@@ -124,10 +124,11 @@ public function has(string $id): bool
      * @param callable $function
      * @param array    $arguments
      *
-     * @return mixed
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
+     *
+     * @return mixed
      */
     public function invoke(callable $function, array $arguments = []): mixed
     {
@@ -142,8 +143,9 @@ public function invoke(callable $function, array $arguments = []): mixed
      * @param string $namespace
      * @param bool   $enforce
      *
-     * @return void
      * @throws ReflectionException
+     *
+     * @return void
      */
     public function loadDefinitionsFromDirectory(string $directory, string $namespace, bool $enforce = false): void
     {
@@ -167,15 +169,16 @@ public function loadDefinitionsFromDirectory(string $directory, string $namespac
      * @param ReflectionMethod|ReflectionFunction $reflectionMethod
      * @param array                               $arguments
      *
-     * @return array
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
+     *
+     * @return array
      */
     private function createArguments(
-        ReflectionMethod|ReflectionFunction $reflectionMethod, array $arguments = []
-    ): array
-    {
+        ReflectionMethod|ReflectionFunction $reflectionMethod,
+        array $arguments = []
+    ): array {
         foreach ($reflectionMethod->getParameters() as $reflectionParameter) {
             $argumentName = $reflectionParameter->getName();
 

tests/ExampleNamespace/ClassB.php

@@ -9,8 +9,7 @@ class ClassB
     public function __construct(
         public ClassA $a,
         public int $count = 2
-    )
-    {
+    ) {
         static::increaseCounter();
     }
-}
+}

tests/ExampleNamespace/ClassC.php

@@ -9,13 +9,12 @@ class ClassC
     public function __construct(
         public ClassA $a,
         public ClassB $b
-    )
-    {
+    ) {
         static::increaseCounter();
     }
 
     public function sayHello()
     {
-        echo "Hello World!";
+        echo 'Hello World!';
     }
 }

tests/ExampleNamespace/CountsInstancesTrait.php

@@ -8,11 +8,11 @@ trait CountsInstancesTrait
 
     public static function increaseCounter(): void
     {
-        static::$instancesCounter ++;
+        static::$instancesCounter++;
     }
 
     public static function resetCounter(): void
     {
         static::$instancesCounter = 0;
     }
-}
+}

tests/ExampleNamespace/InterfaceA.php

@@ -4,5 +4,4 @@
 
 interface InterfaceA
 {
-
 }

tests/ServiceContainerTest.php

@@ -13,6 +13,7 @@
 class ServiceContainerTest extends TestCase
 {
     private ?ServiceContainer $container;
+
     public function testInstancing(): void
     {
         $this->assertInstanceOf(ClassA::class, $this->container->get(ClassA::class));