solved consistency issues

Andrei Onita · Andrei Onita · commit aeaf33e85f92 · 2023-07-11T16:10:44.000+03:00
diff --git a/.github/workflows/cs-tests.yml b/.github/workflows/cs-tests.yml
@@ -43,4 +43,4 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run phpcs checks
-        run: vendor/bin/phpcs
+        run: vendor/bin/phpcs
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -43,4 +43,4 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run static analysis
-        run: vendor/bin/psalm --no-cache --output-format=github --show-info=false --threads=4
+        run: vendor/bin/psalm --no-cache --output-format=github --show-info=false --threads=4
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -44,4 +44,4 @@ jobs:
         run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run PHPUnit tests
-        run: vendor/bin/phpunit --colors=always
+        run: vendor/bin/phpunit --colors=always
diff --git a/composer.json b/composer.json
@@ -28,7 +28,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^10.2",
-        "squizlabs/php_codesniffer": "^3.6",
         "vimeo/psalm": "^5.13",
         "laminas/laminas-coding-standard": "^2.5"
     },
@@ -39,7 +38,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "DotTest\\AnnotatedServices\\": "tests"
+            "DotTest\\AnnotatedServices\\": "test"
         }
     },
     "scripts": {
@@ -58,6 +57,7 @@
         "doctrine/orm": "To be able to inject doctrine repositories."
     },
     "config": {
+        "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
diff --git a/phpcs.xml b/phpcs.xml
@@ -13,8 +13,8 @@
 
     <!-- Paths to check -->
     <file>src</file>
-    <file>tests</file>
+    <file>test</file>
 
     <!-- Include all rules from the Laminas Coding Standard -->
     <rule ref="LaminasCodingStandard"/>
-</ruleset>
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite name="dot-user-agent-sniffer Test Suite">
-            <directory>./tests</directory>
+        <testsuite name="dot-annotated-services Test Suite">
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
     <coverage/>
@@ -11,4 +11,4 @@
             <directory suffix=".php">./src</directory>
         </include>
     </source>
-</phpunit>
+</phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -14,4 +14,4 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-</psalm>
+</psalm>
diff --git a/src/Annotation/Inject.php b/src/Annotation/Inject.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Annotation;
diff --git a/src/Annotation/Service.php b/src/Annotation/Service.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Annotation;
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices;
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Exception;
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Exception;
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Exception;
diff --git a/src/Factory/AbstractAnnotatedFactory.php b/src/Factory/AbstractAnnotatedFactory.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Factory;
diff --git a/src/Factory/AnnotatedServiceAbstractFactory.php b/src/Factory/AnnotatedServiceAbstractFactory.php
@@ -1,16 +1,12 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Factory;
 
 use Dot\AnnotatedServices\Annotation\Service;
-use interop\container\containerinterface;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
+use Psr\Container\ContainerInterface;
 use ReflectionClass;
 
 use function class_exists;
@@ -19,9 +15,8 @@ class AnnotatedServiceAbstractFactory extends AbstractAnnotatedFactory implement
 {
     /**
      * @param string $requestedName
-     * @return bool
      */
-    public function canCreate(containerinterface $container, $requestedName)
+    public function canCreate(ContainerInterface $container, $requestedName): bool
     {
         if ($requestedName === null) {
             return false;
@@ -45,9 +40,8 @@ public function canCreate(containerinterface $container, $requestedName)
     /**
      * @param string $requestedName
      * @param array|null $options
-     * @return object
      */
-    public function __invoke(containerinterface $container, $requestedName, ?array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): object
     {
         $factory = new AnnotatedServiceFactory();
         $factory->setAnnotationReader($this->createAnnotationReader($container));
diff --git a/src/Factory/AnnotatedServiceFactory.php b/src/Factory/AnnotatedServiceFactory.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/dotkernel/dot-annotated-services/ for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Dot\AnnotatedServices\Factory;
@@ -29,23 +25,21 @@
 class AnnotatedServiceFactory extends AbstractAnnotatedFactory
 {
     /**
-     * @return mixed
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
      */
-    public function __invoke(ContainerInterface $container, string $requestedName)
+    public function __invoke(ContainerInterface $container, string $requestedName): mixed
     {
         return $this->createObject($container, $requestedName);
     }
 
     /**
-     * @return mixed
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
      */
-    public function createObject(ContainerInterface $container, string $requestedName)
+    public function createObject(ContainerInterface $container, string $requestedName): mixed
     {
         if (! class_exists($requestedName)) {
             throw RuntimeException::classNotFound($requestedName);
@@ -123,9 +117,8 @@ protected function getServicesToInject(ContainerInterface $container, Inject $in
 
     /**
      * @param array $keys
-     * @return mixed
      */
-    protected function readKeysFromArray(array $keys, mixed $array)
+    protected function readKeysFromArray(array $keys, mixed $array): mixed
     {
         $key = array_shift($keys);
         // When one of the provided keys is not found, throw an exception
diff --git a/test/AnnotatedRepositoryFactoryTest.php b/test/AnnotatedRepositoryFactoryTest.php
@@ -25,8 +25,6 @@ class AnnotatedRepositoryFactoryTest extends TestCase
 
     public function setUp(): void
     {
-        parent::setUp();
-
         $this->container        = $this->createMock(ContainerInterface::class);
         $this->annotationReader = $this->createMock(Reader::class);
         $this->subject          = $this->createPartialMock(Subject::class, ['createAnnotationReader']);
diff --git a/test/AnnotatedServiceFactoryTest.php b/test/AnnotatedServiceFactoryTest.php
@@ -25,8 +25,6 @@ class AnnotatedServiceFactoryTest extends TestCase
 
     public function setUp(): void
     {
-        parent::setUp();
-
         $this->container        = $this->createMock(ContainerInterface::class);
         $this->annotationReader = $this->createMock(Reader::class);
         $this->subject          = $this->createPartialMock(Subject::class, [
diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DotTest\AnnotatedServices;
+
+use Dot\AnnotatedServices\ConfigProvider;
+use PHPUnit\Framework\TestCase;
+
+class ConfigProviderTest extends TestCase
+{
+    protected array $config;
+
+    protected function setup(): void
+    {
+        $this->config = (new ConfigProvider())();
+    }
+
+    public function testHasDependencies(): void
+    {
+        $this->assertArrayHasKey('dependencies', $this->config);
+    }
+
+    public function testDependenciesHasFactories(): void
+    {
+        $this->assertArrayHasKey('abstract_factories', $this->config['dependencies']);
+    }
+}
