Ran php-cs-fixer

php-etl · Jul 8, 2024 · 9d0ccf1 · 9d0ccf1
1 parent f028844
commit 9d0ccf1
Show file tree

Hide file tree

Showing 26 changed files with 116 additions and 118 deletions.
diff --git a/src/ApiType.php b/src/ApiType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Kiboko\Plugin\Sylius;
 
 enum ApiType: string

diff --git a/src/Builder/Capacity/All.php b/src/Builder/Capacity/All.php
@@ -10,11 +10,9 @@
 
 final class All implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $search = null;
-    private null|Node\Expr $code = null;
-
-    public function __construct() {}
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $search = null;
+    private ?Node\Expr $code = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

diff --git a/src/Builder/Capacity/Create.php b/src/Builder/Capacity/Create.php
@@ -11,11 +11,9 @@
 
 final class Create implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $code = null;
-    private null|Node\Expr $data = null;
-
-    public function __construct() {}
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $code = null;
+    private ?Node\Expr $data = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

diff --git a/src/Builder/Capacity/ListPerPage.php b/src/Builder/Capacity/ListPerPage.php
@@ -10,11 +10,9 @@
 
 final class ListPerPage implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $search = null;
-    private null|Node\Expr $code = null;
-
-    public function __construct() {}
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $search = null;
+    private ?Node\Expr $code = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

diff --git a/src/Builder/Capacity/Upsert.php b/src/Builder/Capacity/Upsert.php
@@ -11,11 +11,9 @@
 
 final class Upsert implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $code = null;
-    private null|Node\Expr $data = null;
-
-    public function __construct() {}
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $code = null;
+    private ?Node\Expr $data = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

diff --git a/src/Builder/Client.php b/src/Builder/Client.php
@@ -4,8 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius\Builder;
 
-use Diglin\Sylius\ApiClient\SyliusAdminClientBuilder;
-use Diglin\Sylius\ApiClient\SyliusShopClientBuilder;
 use Kiboko\Plugin\Sylius\ApiType;
 use Kiboko\Plugin\Sylius\MissingAuthenticationMethodException;
 use PhpParser\Builder;
@@ -25,7 +23,10 @@ final class Client implements Builder
     private ?Node\Expr $fileSystem = null;
     private ?Node\Expr $client = null;
 
-    public function __construct(private readonly Node\Expr $baseUrl) {}
+    public function __construct(
+        private readonly Node\Expr $baseUrl,
+    ) {
+    }
 
     public function withSecret(Node\Expr $clientId, Node\Expr $secret): self
     {

diff --git a/src/Builder/Extractor.php b/src/Builder/Extractor.php
@@ -16,7 +16,8 @@ final class Extractor implements StepBuilderInterface
 
     public function __construct(
         private readonly Builder $capacity,
-    ) {}
+    ) {
+    }
 
     public function withClient(Node\Expr $client): self
     {

diff --git a/src/Builder/Loader.php b/src/Builder/Loader.php
@@ -14,7 +14,10 @@ final class Loader implements StepBuilderInterface
     private ?Node\Expr $client = null;
     private ?Node $type = null;
 
-    public function __construct(private readonly Builder $capacity) {}
+    public function __construct(
+        private readonly Builder $capacity
+    ) {
+    }
 
     public function withClient(Node\Expr $client): self
     {

diff --git a/src/Builder/Search.php b/src/Builder/Search.php
@@ -11,14 +11,15 @@ final class Search implements Builder
 {
     public function __construct(
         private array $filters = []
-    ) {}
+    ) {
+    }
 
     public function addFilter(
         Node\Expr $field,
         Node\Expr $operator,
-        Node\Expr $value = null,
-        Node\Expr $scope = null,
-        Node\Expr $locale = null
+        ?Node\Expr $value = null,
+        ?Node\Expr $scope = null,
+        ?Node\Expr $locale = null
     ): self {
         $arguments = [
             new Node\Arg(

diff --git a/src/Capacity/All.php b/src/Capacity/All.php
@@ -13,11 +13,17 @@
 
 final readonly class All implements CapacityInterface
 {
-    public function __construct(private ExpressionLanguage $interpreter) {}
+    public function __construct(
+        private readonly ExpressionLanguage $interpreter
+    ) {
+    }
 
     public function applies(array $config): bool
     {
-        $endpoints = [...Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES, ...Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES];
+        $endpoints = array_merge(
+            Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES,
+            Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES,
+        );
 
         return isset($config['type'])
             && \array_key_exists($config['type'], $endpoints)

diff --git a/src/Capacity/Create.php b/src/Capacity/Create.php
@@ -4,7 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius\Capacity;
 
-use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Kiboko\Plugin\Sylius;
 use PhpParser\Builder;
 use PhpParser\Node;

diff --git a/src/Capacity/ListPerPage.php b/src/Capacity/ListPerPage.php
@@ -13,11 +13,17 @@
 
 final readonly class ListPerPage implements CapacityInterface
 {
-    public function __construct(private ExpressionLanguage $interpreter) {}
+    public function __construct(
+        private readonly ExpressionLanguage $interpreter
+    ) {
+    }
 
     public function applies(array $config): bool
     {
-        $endpoints = [...Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES, ...Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES];
+        $endpoints = array_merge(
+            Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES,
+            Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES,
+        );
 
         return isset($config['type'])
             && \array_key_exists($config['type'], $endpoints)

diff --git a/src/Capacity/Upsert.php b/src/Capacity/Upsert.php
@@ -12,7 +12,10 @@ final class Upsert implements CapacityInterface
 {
     public function applies(array $config): bool
     {
-        $endpoints = [...Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES, ...Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES];
+        $endpoints = array_merge(
+            Sylius\Validator\ExtractorConfigurationValidator::ADMIN_VALID_TYPES,
+            Sylius\Validator\ExtractorConfigurationValidator::SHOP_VALID_TYPES,
+        );
 
         return isset($config['type'])
             && \array_key_exists($config['type'], $endpoints)

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -4,7 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius;
 
-use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Kiboko\Contract\Configurator\PluginConfigurationInterface;
 use Kiboko\Plugin\Sylius\Validator\ExtractorConfigurationValidator;
 use Kiboko\Plugin\Sylius\Validator\LoaderConfigurationValidator;

diff --git a/src/Configuration/Client.php b/src/Configuration/Client.php
@@ -11,22 +11,22 @@
 
 final class Client implements Config\Definition\ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder(): Config\Definition\Builder\TreeBuilder
     {
         $builder = new Config\Definition\Builder\TreeBuilder('client');
 
         /* @phpstan-ignore-next-line */
         $builder->getRootNode()
             ->validate()
-                ->ifTrue(fn($v) => !empty($v['token']) && (!empty($v['username']) || !empty($v['password'])))
+                ->ifTrue(fn ($value) => !empty($value['token']) && (!empty($value['username']) || !empty($value['password'])))
                 ->thenInvalid('You cannot specify both a token and a username/password combination.')
             ->end()
             ->validate()
-                ->ifTrue(fn($v) => (!empty($v['username']) && empty($v['password'])) || (empty($v['username']) && !empty($v['password'])))
+                ->ifTrue(fn ($value) => (!empty($value['username']) && empty($value['password'])) || (empty($value['username']) && !empty($value['password'])))
                 ->thenInvalid('Both username and password must be defined together.')
             ->end()
             ->validate()
-                ->ifTrue(fn($v) => empty($v['token']) && (empty($v['username']) || empty($v['password'])))
+                ->ifTrue(fn ($value) => empty($value['token']) && (empty($value['username']) || empty($value['password'])))
                 ->thenInvalid('You must specify either a token or a username and password combination.')
             ->end()
             ->children()

diff --git a/src/Configuration/Extractor.php b/src/Configuration/Extractor.php
@@ -4,15 +4,14 @@
 
 namespace Kiboko\Plugin\Sylius\Configuration;
 
-use Kiboko\Plugin\Sylius\Validator\ExtractorConfigurationValidator;
 use Symfony\Component\Config;
 
 use function Kiboko\Component\SatelliteToolbox\Configuration\asExpression;
 use function Kiboko\Component\SatelliteToolbox\Configuration\isExpression;
 
 final class Extractor implements Config\Definition\ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder(): Config\Definition\Builder\TreeBuilder
     {
         $filters = new Search();
 

diff --git a/src/Configuration/Loader.php b/src/Configuration/Loader.php
@@ -4,12 +4,11 @@
 
 namespace Kiboko\Plugin\Sylius\Configuration;
 
-use Kiboko\Plugin\Sylius\Validator\LoaderConfigurationValidator;
 use Symfony\Component\Config;
 
 final class Loader implements Config\Definition\ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder(): Config\Definition\Builder\TreeBuilder
     {
         $builder = new Config\Definition\Builder\TreeBuilder('loader');
 

diff --git a/src/Configuration/Search.php b/src/Configuration/Search.php
@@ -11,7 +11,7 @@
 
 final class Search implements Config\Definition\ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder(): Config\Definition\Builder\TreeBuilder
     {
         $builder = new Config\Definition\Builder\TreeBuilder('search');
 

diff --git a/src/Factory/Client.php b/src/Factory/Client.php
@@ -76,39 +76,39 @@ public function compile(array $config): Repository\Client
                 compileValueWhenExpression($this->interpreter, $config['api_url']),
             );
 
-//            if (isset($config['context'])) {
-//                if (isset($config['context']['http_client'])) {
-//                    $clientBuilder->withHttpClient($this->buildFactoryNode($config['context']['http_client']));
-//                }
-//                if (isset($config['context']['http_request_factory'])) {
-//                    $clientBuilder->withHttpRequestFactory($this->buildFactoryNode($config['context']['http_request_factory']));
-//                }
-//                if (isset($config['context']['http_stream_factory'])) {
-//                    $clientBuilder->withHttpStreamFactory($this->buildFactoryNode($config['context']['http_stream_factory']));
-//                }
-//                if (isset($config['context']['filesystem'])) {
-//                    $clientBuilder->withFileSystem($this->buildFactoryNode($config['context']['filesystem']));
-//                }
-//            }
+            //            if (isset($config['context'])) {
+            //                if (isset($config['context']['http_client'])) {
+            //                    $clientBuilder->withHttpClient($this->buildFactoryNode($config['context']['http_client']));
+            //                }
+            //                if (isset($config['context']['http_request_factory'])) {
+            //                    $clientBuilder->withHttpRequestFactory($this->buildFactoryNode($config['context']['http_request_factory']));
+            //                }
+            //                if (isset($config['context']['http_stream_factory'])) {
+            //                    $clientBuilder->withHttpStreamFactory($this->buildFactoryNode($config['context']['http_stream_factory']));
+            //                }
+            //                if (isset($config['context']['filesystem'])) {
+            //                    $clientBuilder->withFileSystem($this->buildFactoryNode($config['context']['filesystem']));
+            //                }
+            //            }
 
             $clientBuilder->withClientBuilder(
                 new Node\Expr\New_(
                     new Node\Name\FullyQualified(
-                        $this->type == Sylius\ApiType::ADMIN ? \Diglin\Sylius\ApiClient\SyliusAdminClientBuilder::class : \Diglin\Sylius\ApiClient\SyliusShopClientBuilder::class
+                        Sylius\ApiType::ADMIN == $this->type ? 'Diglin\\Sylius\\ApiClient\\SyliusAdminClientBuilder' : 'Diglin\\Sylius\\ApiClient\\SyliusShopClientBuilder'
                     ),
                 )
             );
 
-//            if (isset($config['client_id']) && isset($config['secret'])) {
-//                if (isset($config['api_type']) && $config['api_type'] === Sylius\Validator\ApiType::LEGACY->value) {
-//                    $clientBuilder->withSecret(
-//                        compileValueWhenExpression($this->interpreter, $config['client_id']),
-//                        compileValueWhenExpression($this->interpreter, $config['secret'])
-//                    );
-//                }
-//            }
+            //            if (isset($config['client_id']) && isset($config['secret'])) {
+            //                if (isset($config['api_type']) && $config['api_type'] === Sylius\Validator\ApiType::LEGACY->value) {
+            //                    $clientBuilder->withSecret(
+            //                        compileValueWhenExpression($this->interpreter, $config['client_id']),
+            //                        compileValueWhenExpression($this->interpreter, $config['secret'])
+            //                    );
+            //                }
+            //            }
 
-            if (isset($config['username']) && isset($config['password'])) {
+            if (isset($config['username'], $config['password'])) {
                 $clientBuilder->withPassword(
                     compileValueWhenExpression($this->interpreter, $config['username']),
                     compileValueWhenExpression($this->interpreter, $config['password']),

diff --git a/src/Factory/NoApplicableCapacityException.php b/src/Factory/NoApplicableCapacityException.php
@@ -4,4 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius\Factory;
 
-final class NoApplicableCapacityException extends \OutOfRangeException {}
+final class NoApplicableCapacityException extends \OutOfRangeException
+{
+}
diff --git a/src/MissingAuthenticationMethodException.php b/src/MissingAuthenticationMethodException.php
@@ -4,4 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius;
 
-final class MissingAuthenticationMethodException extends \RuntimeException {}
+final class MissingAuthenticationMethodException extends \RuntimeException
+{
+}
diff --git a/src/MissingEndpointException.php b/src/MissingEndpointException.php
@@ -4,4 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius;
 
-final class MissingEndpointException extends \RuntimeException {}
+final class MissingEndpointException extends \RuntimeException
+{
+}
diff --git a/src/MissingParameterException.php b/src/MissingParameterException.php
@@ -4,4 +4,6 @@
 
 namespace Kiboko\Plugin\Sylius;
 
-final class MissingParameterException extends \UnexpectedValueException {}
+final class MissingParameterException extends \UnexpectedValueException
+{
+}
diff --git a/src/Service.php b/src/Service.php
@@ -7,10 +7,10 @@
 use Kiboko\Contract\Configurator;
 use Kiboko\Contract\Configurator\ConfigurationExceptionInterface;
 use Kiboko\Contract\Configurator\InvalidConfigurationException;
+use PhpParser\Node;
 use Symfony\Component\Config\Definition\Exception as Symfony;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use PhpParser\Node;
 
 #[Configurator\Pipeline(
     name: 'sylius',
@@ -93,8 +93,9 @@ public function compile(array $config): Factory\Repository\Extractor|Factory\Rep
                 $client = $clientFactory->compile($config['client']);
 
                 $extractorBuilder
-                    ->withClientType(ApiType::from($config['version']) == ApiType::ADMIN ? new Node\Name\FullyQualified(name: \Diglin\Sylius\ApiClient\SyliusAdminClientInterface::class) : new Node\Name\FullyQualified(name: \Diglin\Sylius\ApiClient\SyliusShopClientInterface::class))
-                    ->withClient($client->getBuilder()->getNode());
+                    ->withClientType(ApiType::ADMIN == ApiType::from($config['version']) ? new Node\Name\FullyQualified(name: 'Diglin\\Sylius\\ApiClient\\SyliusAdminClientInterface') : new Node\Name\FullyQualified(name: 'Diglin\\Sylius\\ApiClient\\SyliusShopClientInterface'))
+                    ->withClient($client->getBuilder()->getNode())
+                ;
 
                 $extractor->merge($client);
 
@@ -109,8 +110,9 @@ public function compile(array $config): Factory\Repository\Extractor|Factory\Rep
                 $client = $clientFactory->compile($config['client']);
 
                 $loaderBuilder
-                    ->withClientType(ApiType::from($config['version']) == ApiType::ADMIN ? new Node\Name\FullyQualified(name: \Diglin\Sylius\ApiClient\SyliusAdminClientInterface::class) : new Node\Name\FullyQualified(name: \Diglin\Sylius\ApiClient\SyliusShopClientInterface::class))
-                    ->withClient($client->getBuilder()->getNode());
+                    ->withClientType(ApiType::ADMIN == ApiType::from($config['version']) ? new Node\Name\FullyQualified(name: 'Diglin\\Sylius\\ApiClient\\SyliusAdminClientInterface') : new Node\Name\FullyQualified(name: 'Diglin\\Sylius\\ApiClient\\SyliusShopClientInterface'))
+                    ->withClient($client->getBuilder()->getNode())
+                ;
 
                 $loader->merge($client);