From 8aa0c1633033ccf2a2b36c26edbd775b74a58fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Franti=C5=A1ek=20Bu=C4=8D=C3=ADk?= <bucik@ics.muni.cz> Date: Fri, 22 Jul 2022 10:04:53 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20ECS=20configuration?= =?UTF-8?q?=20(after=20update)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs.php | 40 ++++++++++++++++++++++------------------ lib/Config.php | 2 +- lib/DatabaseCommand.php | 6 +++--- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/ecs.php b/ecs.php index 789982e..700e64e 100644 --- a/ecs.php +++ b/ecs.php @@ -5,12 +5,12 @@ declare(strict_types=1); use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer; use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer; use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Symplify\EasyCodingStandard\Config\ECSConfig; use Symplify\EasyCodingStandard\ValueObject\Option; use Symplify\EasyCodingStandard\ValueObject\Set\SetList; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (ECSConfig $ecsConfig): void { + $parameters = $ecsConfig->parameters(); $parameters->set(Option::PATHS, [ __DIR__ . '/ecs.php', __DIR__ . '/config-templates', @@ -23,22 +23,26 @@ return static function (ContainerConfigurator $containerConfigurator): void { $parameters->set(Option::PARALLEL, true); $parameters->set(Option::SKIP, [NotOperatorWithSuccessorSpaceFixer::class, FunctionTypehintSpaceFixer::class]); - $containerConfigurator->import(SetList::PHP_CS_FIXER); - $containerConfigurator->import(SetList::CLEAN_CODE); - $containerConfigurator->import(SetList::SYMPLIFY); - $containerConfigurator->import(SetList::ARRAY); - $containerConfigurator->import(SetList::COMMON); - $containerConfigurator->import(SetList::COMMENTS); - $containerConfigurator->import(SetList::CONTROL_STRUCTURES); - $containerConfigurator->import(SetList::DOCBLOCK); - $containerConfigurator->import(SetList::NAMESPACES); - $containerConfigurator->import(SetList::PHPUNIT); - $containerConfigurator->import(SetList::SPACES); - $containerConfigurator->import(SetList::STRICT); - $containerConfigurator->import(SetList::SYMFONY); - $containerConfigurator->import(SetList::PSR_12); + $ecsConfig->sets( + [ + SetList::PHP_CS_FIXER, + SetList::CLEAN_CODE, + SetList::SYMPLIFY, + SetList::ARRAY, + SetList::COMMON, + SetList::COMMENTS, + SetList::CONTROL_STRUCTURES, + SetList::DOCBLOCK, + SetList::NAMESPACES, + SetList::PHPUNIT, + SetList::SPACES, + SetList::STRICT, + SetList::SYMFONY, + SetList::PSR_12, + ] + ); - $services = $containerConfigurator->services(); + $services = $ecsConfig->services(); $services->set(ArraySyntaxFixer::class) ->call('configure', [[ 'syntax' => 'short', diff --git a/lib/Config.php b/lib/Config.php index a567e7c..4420cf7 100644 --- a/lib/Config.php +++ b/lib/Config.php @@ -56,7 +56,7 @@ class Config { $this->config = Configuration::getConfig(self::CONFIG_FILE_NAME); $this->store = $this->config->getConfigItem(self::STORE, null); - $this->tables = $this->config->getArray('tables', []);; + $this->tables = $this->config->getArray('tables', []); $this->sourceIdpEntityIdAttribute = $this->config->getString(self::SOURCE_IDP_ENTITY_ID_ATTRIBUTE, ''); $this->mode = $this->config->getValueValidate(self::MODE, self::KNOWN_MODES, self::MODE_PROXY); $this->keepPerUser = $this->config->getIntegerRange(self::KEEP_PER_USER, 31, 1827, 31); diff --git a/lib/DatabaseCommand.php b/lib/DatabaseCommand.php index 9238dbf..52be98b 100644 --- a/lib/DatabaseCommand.php +++ b/lib/DatabaseCommand.php @@ -289,11 +289,11 @@ class DatabaseCommand ]; if (Config::MODE_IDP !== $this->mode && Config::MODE_MULTI_IDP !== $this->mode) { $entities[Config::MODE_IDP][self::KEY_ID] = $this->getIdpIdentifier($request); - $entities[Config::MODE_IDP][self::KEY_NAME] =$this->getIdpName($request); + $entities[Config::MODE_IDP][self::KEY_NAME] = $this->getIdpName($request); } if (Config::MODE_SP !== $this->mode) { $entities[Config::MODE_SP][self::KEY_ID] = $this->getSpIdentifier($request); - $entities[Config::MODE_SP][self::KEY_NAME] =$this->getSpName($request); + $entities[Config::MODE_SP][self::KEY_NAME] = $this->getSpName($request); } if (Config::MODE_PROXY !== $this->mode && Config::MODE_MULTI_IDP !== $this->mode) { @@ -320,7 +320,7 @@ class DatabaseCommand $query = 'INSERT INTO ' . $this->tables[$table] . '(identifier, name) VALUES (:identifier, :name1) '; if ($this->isPgsql()) { $query .= 'ON CONFLICT (identifier) DO UPDATE SET name = :name2;'; - } else if ($this->isMysql()) { + } elseif ($this->isMysql()) { $query .= 'ON DUPLICATE KEY UPDATE name = :name2'; } else { $this->unknownDriver(); -- GitLab