manage exception for tests and infection, change xml version for vali…

…date phpunit config, rename coverage by source
php-etl · Nov 20, 2023 · 67dacf9 · 67dacf9
1 parent 53fa3b1
commit 67dacf9
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
         backupGlobals="true"
         colors="false"
         processIsolation="false"
@@ -21,11 +21,11 @@
             <directory>tests/functional/</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
     <php>
         <ini name="allow_url_include" value="1" />
     </php>

diff --git a/src/Capacity/All.php b/src/Capacity/All.php
@@ -120,6 +120,9 @@ public function __construct(private readonly ExpressionLanguage $interpreter) {}
 
     public function applies(array $config): bool
     {
+        if (!isset($config['api_type'])) {
+            return false;
+        }
         switch ($config['api_type']) {
             case 'admin':
                 $endpoints = self::$endpointsAdmin;

diff --git a/src/Capacity/Create.php b/src/Capacity/Create.php
@@ -4,6 +4,7 @@
 
 namespace Kiboko\Plugin\Sylius\Capacity;
 
+use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Kiboko\Plugin\Sylius;
 use Kiboko\Plugin\Sylius\Validator\ApiType;
 use PhpParser\Builder;
@@ -79,6 +80,9 @@ final class Create implements CapacityInterface
 
     public function applies(array $config): bool
     {
+        if(!isset($config['api_type'])) {
+            throw new InvalidConfigurationException('Your Sylius API configuration is using some unsupported capacity, check your "api_type" properties to a suitable set.');
+        }
         $endpoints = match ($config['api_type']) {
             'admin' => self::$endpointsAdmin,
             'shop' => self::$endpointsShop,

diff --git a/src/Capacity/ListPerPage.php b/src/Capacity/ListPerPage.php
@@ -119,6 +119,9 @@ public function __construct(private readonly ExpressionLanguage $interpreter) {}
 
     public function applies(array $config): bool
     {
+        if (!isset($config['api_type'])) {
+            return false;
+        }
         switch ($config['api_type']) {
             case 'admin':
                 $endpoints = self::$endpointsAdmin;

diff --git a/src/Capacity/Upsert.php b/src/Capacity/Upsert.php
@@ -71,6 +71,9 @@ final class Upsert implements CapacityInterface
 
     public function applies(array $config): bool
     {
+        if (!isset($config['api_type'])) {
+            return false;
+        }
         $endpoints = match ($config['api_type']) {
             'admin' => self::$endpointsAdmin,
             'shop' => self::$endpointsShop,

diff --git a/tests/functional/Factory/ExtractorTest.php b/tests/functional/Factory/ExtractorTest.php
@@ -40,6 +40,18 @@ public static function wrongApiType(): \Generator
                 'api_type' => 'wrong',
             ],
         ];
+        yield [
+            'config' => [
+                'type' => 'products',
+                'api_type' => 'wrong',
+            ],
+        ];
+        yield [
+            'config' => [
+                'method' => 'get',
+                'api_type' => 'wrong',
+            ],
+        ];
     }
 
     public static function missingApiType(): \Generator
@@ -131,9 +143,9 @@ public function testWrongApiType(array $config)
     #[\PHPUnit\Framework\Attributes\DataProvider('missingApiType')]
     public function testMissingApiType(array $config)
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionCode(0);
-        $this->expectExceptionMessage('The value of api_type should be one of [admin, shop, legacy], got null.');
+        $this->expectExceptionMessage('Your Sylius API configuration is using some unsupported capacity, check your "api_type" properties to a suitable set.');
 
         $client = new Loader();
         $this->assertFalse($client->validate($config));

diff --git a/tests/functional/Factory/LoaderTest.php b/tests/functional/Factory/LoaderTest.php
@@ -128,9 +128,9 @@ public function testWrongApiType(array $config)
     #[\PHPUnit\Framework\Attributes\DataProvider('missingApiType')]
     public function testMissingApiType(array $config)
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionCode(0);
-        $this->expectExceptionMessage('The value of api_type should be one of [admin, shop, legacy], got null.');
+        $this->expectExceptionMessage('Your Sylius API configuration is using some unsupported capacity, check your "api_type" properties to a suitable set.');
 
         $client = new Loader();
         $this->assertFalse($client->validate($config));