Skip to content

Commit

Permalink
cs-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
JoMessina committed Nov 20, 2023
1 parent 29e1b3f commit b39d262
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 83 deletions.
4 changes: 1 addition & 3 deletions src/Builder/Capacity/All.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ final class All implements Builder
private null|Node\Expr $search = null;
private null|Node\Expr $code = null;

public function __construct()
{
}
public function __construct() {}

public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
{
Expand Down
4 changes: 1 addition & 3 deletions src/Builder/Capacity/Create.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ final class Create implements Builder
private null|Node\Expr $code = null;
private null|Node\Expr $data = null;

public function __construct()
{
}
public function __construct() {}

public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
{
Expand Down
4 changes: 1 addition & 3 deletions src/Builder/Capacity/ListPerPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ final class ListPerPage implements Builder
private null|Node\Expr $search = null;
private null|Node\Expr $code = null;

public function __construct()
{
}
public function __construct() {}

public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
{
Expand Down
4 changes: 1 addition & 3 deletions src/Builder/Capacity/Upsert.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ final class Upsert implements Builder
private null|Node\Expr $code = null;
private null|Node\Expr $data = null;

public function __construct()
{
}
public function __construct() {}

public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
{
Expand Down
4 changes: 1 addition & 3 deletions src/Builder/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ final class Client implements Builder
public const API_SHOP_KEY = 'shop';
public const API_LEGACY_KEY = 'legacy';

public function __construct(private readonly Node\Expr $baseUrl, private readonly Node\Expr $clientId, private readonly Node\Expr $secret)
{
}
public function __construct(private readonly Node\Expr $baseUrl, private readonly Node\Expr $clientId, private readonly Node\Expr $secret) {}

public function withToken(Node\Expr $token, Node\Expr $refreshToken): self
{
Expand Down
6 changes: 2 additions & 4 deletions src/Builder/Extractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ final class Extractor implements StepBuilderInterface
private ?Node\Expr $client = null;
private string $apiType;

public function __construct(private readonly Builder $capacity)
{
}
public function __construct(private readonly Builder $capacity) {}

public function withClient(Node\Expr $client): self
{
Expand Down Expand Up @@ -133,12 +131,12 @@ class: new Node\Stmt\Class_(

public function getParamsNode(): array

Check failure on line 132 in src/Builder/Extractor.php

View workflow job for this annotation

GitHub Actions / phpstan-8

Method Kiboko\Plugin\Sylius\Builder\Extractor::getParamsNode() return type has no value type specified in iterable type array.

Check failure on line 132 in src/Builder/Extractor.php

View workflow job for this annotation

GitHub Actions / phpstan-7

Method Kiboko\Plugin\Sylius\Builder\Extractor::getParamsNode() return type has no value type specified in iterable type array.
{

$className = match ($this->apiType) {

Check failure on line 134 in src/Builder/Extractor.php

View workflow job for this annotation

GitHub Actions / phpstan-8

Match expression does not handle remaining value: string

Check failure on line 134 in src/Builder/Extractor.php

View workflow job for this annotation

GitHub Actions / phpstan-7

Match expression does not handle remaining value: string

Check failure on line 134 in src/Builder/Extractor.php

View workflow job for this annotation

GitHub Actions / phpstan

Match expression does not handle remaining value: string
Client::API_ADMIN_KEY => \Diglin\Sylius\ApiClient\SyliusAdminClientInterface::class,
Client::API_LEGACY_KEY => \Diglin\Sylius\ApiClient\SyliusLegacyClientInterface::class,
Client::API_SHOP_KEY => \Diglin\Sylius\ApiClient\SyliusShopClientInterface::class,
};

return [
new Node\Param(
var: new Node\Expr\Variable('client'),
Expand Down
6 changes: 2 additions & 4 deletions src/Builder/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ final class Loader implements StepBuilderInterface
private ?Node\Expr $client = null;
private string $apiType;

public function __construct(private readonly Builder $capacity)
{
}
public function __construct(private readonly Builder $capacity) {}

public function withClient(Node\Expr $client): self
{
Expand Down Expand Up @@ -139,12 +137,12 @@ class: new Node\Stmt\Class_(

public function getParamsNode(): array

Check failure on line 138 in src/Builder/Loader.php

View workflow job for this annotation

GitHub Actions / phpstan-7

Method Kiboko\Plugin\Sylius\Builder\Loader::getParamsNode() return type has no value type specified in iterable type array.
{

$className = match ($this->apiType) {

Check failure on line 140 in src/Builder/Loader.php

View workflow job for this annotation

GitHub Actions / phpstan-7

Match expression does not handle remaining value: string

Check failure on line 140 in src/Builder/Loader.php

View workflow job for this annotation

GitHub Actions / phpstan

Match expression does not handle remaining value: string
Client::API_ADMIN_KEY => \Diglin\Sylius\ApiClient\SyliusAdminClientInterface::class,
Client::API_LEGACY_KEY => \Diglin\Sylius\ApiClient\SyliusLegacyClientInterface::class,
Client::API_SHOP_KEY => \Diglin\Sylius\ApiClient\SyliusShopClientInterface::class,
};

return [
new Node\Param(
var: new Node\Expr\Variable('client'),
Expand Down
7 changes: 3 additions & 4 deletions src/Capacity/All.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,14 @@ final class All implements CapacityInterface
'order',
];

public function __construct(private readonly ExpressionLanguage $interpreter)
{
}
public function __construct(private readonly ExpressionLanguage $interpreter) {}

public function applies(array $config): bool
{
if (!isset($config['api_type'])) {
return false;
}
switch($config['api_type']) {
switch ($config['api_type']) {
case 'admin':
$endpoints = self::$endpointsAdmin;
$doubleEndpoints = self::$doubleEndpointsAdmin;
Expand All @@ -142,6 +140,7 @@ public function applies(array $config): bool
$doubleEndpoints = [];
break;
}

return isset($config['type'])
&& (\in_array($config['type'], $endpoints) || \in_array($config['type'], $doubleEndpoints))
&& isset($config['method'])
Expand Down
5 changes: 3 additions & 2 deletions src/Capacity/Create.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,12 @@ public function applies(array $config): bool
if (!isset($config['api_type'])) {
return false;
}
$endpoints = match($config['api_type']) {
$endpoints = match ($config['api_type']) {

Check failure on line 84 in src/Capacity/Create.php

View workflow job for this annotation

GitHub Actions / phpstan

Match expression does not handle remaining value: mixed
'admin' => self::$endpointsAdmin,
'shop' =>self::$endpointsShop,
'shop' => self::$endpointsShop,
'legacy' => self::$endpointsLegacy,
};

return isset($config['type'])
&& \in_array($config['type'], $endpoints)
&& isset($config['method'])
Expand Down
7 changes: 3 additions & 4 deletions src/Capacity/ListPerPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,14 @@ final class ListPerPage implements CapacityInterface
'order',
];

public function __construct(private readonly ExpressionLanguage $interpreter)
{
}
public function __construct(private readonly ExpressionLanguage $interpreter) {}

public function applies(array $config): bool
{
if (!isset($config['api_type'])) {
return false;
}
switch($config['api_type']) {
switch ($config['api_type']) {
case 'admin':
$endpoints = self::$endpointsAdmin;
$doubleEndpoints = self::$doubleEndpointsAdmin;
Expand All @@ -141,6 +139,7 @@ public function applies(array $config): bool
$doubleEndpoints = [];
break;
}

return isset($config['type'])
&& (\in_array($config['type'], $endpoints) || \in_array($config['type'], $doubleEndpoints))
&& isset($config['method'])
Expand Down
5 changes: 3 additions & 2 deletions src/Capacity/Upsert.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ public function applies(array $config): bool
if (!isset($config['api_type'])) {
return false;
}
$endpoints = match($config['api_type']) {
$endpoints = match ($config['api_type']) {

Check failure on line 76 in src/Capacity/Upsert.php

View workflow job for this annotation

GitHub Actions / phpstan

Match expression does not handle remaining value: mixed
'admin' => self::$endpointsAdmin,
'shop' =>self::$endpointsShop,
'shop' => self::$endpointsShop,
'legacy' => self::$endpointsLegacy,
};

return isset($config['type'])
&& \in_array($config['type'], $endpoints)
&& isset($config['method'])
Expand Down
2 changes: 0 additions & 2 deletions src/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

use Kiboko\Contract\Configurator\PluginConfigurationInterface;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use function Kiboko\Component\SatelliteToolbox\Configuration\asExpression;
use function Kiboko\Component\SatelliteToolbox\Configuration\isExpression;

final class Configuration implements PluginConfigurationInterface
{
Expand Down
13 changes: 5 additions & 8 deletions src/Configuration/Extractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@

namespace Kiboko\Plugin\Sylius\Configuration;

use Kiboko\Plugin\Sylius\Validator\ApiType;
use Kiboko\Plugin\Sylius\Validator\ExtractorConfigurationValidator;
use Kiboko\Plugin\Sylius\Validator\LoaderConfigurationValidator;
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
{
$filters = new Search();
Expand All @@ -24,34 +21,34 @@ public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Bui
/* @phpstan-ignore-next-line */
$builder->getRootNode()
->validate()
->always(fn(array $item) => ExtractorConfigurationValidator::validate($item)) //store the item value
->always(fn (array $item) => ExtractorConfigurationValidator::validate($item)) // store the item value
->end()
->children()
->scalarNode('api_type')
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => ExtractorConfigurationValidator::validateApiType($item)) //check index of the item value
->always(fn (string $item) => ExtractorConfigurationValidator::validateApiType($item)) // check index of the item value
->end()
->end()
->scalarNode('type')
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => ExtractorConfigurationValidator::validateType($item)) //check index of the item value
->always(fn (string $item) => ExtractorConfigurationValidator::validateType($item)) // check index of the item value
->end()
->end()
->scalarNode('method')
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => ExtractorConfigurationValidator::validateMethod($item)) //check index of the item value
->always(fn (string $item) => ExtractorConfigurationValidator::validateMethod($item)) // check index of the item value
->end()
->end()
->scalarNode('code')
->cannotBeEmpty()
->validate()
->always(fn(string $item) => ExtractorConfigurationValidator::validateCode($item)) //check index of the item value
->always(fn (string $item) => ExtractorConfigurationValidator::validateCode($item)) // check index of the item value
->end()
->validate()
->ifTrue(isExpression())
Expand Down
8 changes: 3 additions & 5 deletions src/Configuration/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

namespace Kiboko\Plugin\Sylius\Configuration;

use Kiboko\Plugin\Sylius\Validator\ApiType;
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
{
$builder = new Config\Definition\Builder\TreeBuilder('loader');
Expand All @@ -22,21 +20,21 @@ public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Bui
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => LoaderConfigurationValidator::validateApiType($item))
->always(fn (string $item) => LoaderConfigurationValidator::validateApiType($item))
->end()
->end()
->scalarNode('type')
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => LoaderConfigurationValidator::validateType($item))
->always(fn (string $item) => LoaderConfigurationValidator::validateType($item))
->end()
->end()
->scalarNode('method')
->isRequired()
->cannotBeEmpty()
->validate()
->always(fn(string $item) => LoaderConfigurationValidator::validateMethod($item))
->always(fn (string $item) => LoaderConfigurationValidator::validateMethod($item))
->end()
->end()
->end()
Expand Down
4 changes: 2 additions & 2 deletions src/Factory/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function normalize(array $config): array
{
try {
return $this->processor->processConfiguration($this->configuration, $config);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
}
}
Expand Down Expand Up @@ -110,7 +110,7 @@ public function compile(array $config): Repository\Client
return new Repository\Client($clientBuilder);
} catch (Sylius\MissingAuthenticationMethodException $exception) {
throw new Configurator\InvalidConfigurationException(message: 'Your Sylius API configuration is missing an authentication method, you should either define "username" or "token" options.', previous: $exception);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/Extractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function normalize(array $config): array
{
try {
return $this->processor->processConfiguration($this->configuration, $config);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function normalize(array $config): array
{
try {
return $this->processor->processConfiguration($this->configuration, $config);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/Factory/NoApplicableCapacityException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

namespace Kiboko\Plugin\Sylius\Factory;

final class NoApplicableCapacityException extends \OutOfRangeException
{
}
final class NoApplicableCapacityException extends \OutOfRangeException {}
2 changes: 1 addition & 1 deletion src/Factory/Repository/RepositoryTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ trait RepositoryTrait
/** @var string[] */
private array $packages;

public function addFiles(FileInterface|DirectoryInterface ...$files): Configurator\RepositoryInterface
public function addFiles(DirectoryInterface|FileInterface ...$files): Configurator\RepositoryInterface
{
array_push($this->files, ...$files);

Expand Down
4 changes: 2 additions & 2 deletions src/Factory/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function normalize(array $config): array
{
try {
return $this->processor->processConfiguration($this->configuration, $config);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
}
}
Expand All @@ -59,7 +59,7 @@ public function compile(array $config): Repository\Search
}

return new Repository\Search($builder);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
} catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/MissingAuthenticationMethodException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

namespace Kiboko\Plugin\Sylius;

final class MissingAuthenticationMethodException extends \RuntimeException
{
}
final class MissingAuthenticationMethodException extends \RuntimeException {}
4 changes: 1 addition & 3 deletions src/MissingEndpointException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

namespace Kiboko\Plugin\Sylius;

final class MissingEndpointException extends \RuntimeException
{
}
final class MissingEndpointException extends \RuntimeException {}
4 changes: 1 addition & 3 deletions src/MissingParameterException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

namespace Kiboko\Plugin\Sylius;

final class MissingParameterException extends \UnexpectedValueException
{
}
final class MissingParameterException extends \UnexpectedValueException {}

0 comments on commit b39d262

Please sign in to comment.