From 2b7c28d30e0b68823adf2ed600813c1aca91a00a Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 24 Sep 2018 09:25:58 +0200 Subject: [PATCH 1/2] use prettyci instead of styleci --- .gitignore | 1 + .php_cs | 13 ------------- .php_cs.dist | 14 ++++++++++++++ .styleci.yml | 12 ------------ 4 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 .php_cs create mode 100644 .php_cs.dist delete mode 100644 .styleci.yml diff --git a/.gitignore b/.gitignore index 16b4a200..2e27c436 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.php_cs.cache /behat.yml /build/ /composer.lock diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 23ba165e..00000000 --- a/.php_cs +++ /dev/null @@ -1,13 +0,0 @@ -exclude('Resources') + ->exclude('vendor') + ->in(__DIR__) +; + +return PhpCsFixer\Config::create() + ->setRules([ + '@Symfony' => true, + 'array_syntax' => ['syntax' => 'short'], + ]) + ->setFinder($finder); diff --git a/.styleci.yml b/.styleci.yml deleted file mode 100644 index 435b5fb4..00000000 --- a/.styleci.yml +++ /dev/null @@ -1,12 +0,0 @@ -preset: symfony - -finder: - exclude: - - "Resources" - - "vendor" - -enabled: - - short_array_syntax - -disabled: - - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198 From 6204b4668d21166b9265d3dca3d723b9902bfbde Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 24 Sep 2018 09:26:20 +0200 Subject: [PATCH 2/2] consistent dot at end of sentence --- DependencyInjection/Configuration.php | 6 +++--- DependencyInjection/HttplugExtension.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 031fb5b0..88426e56 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -399,7 +399,7 @@ private function createClientPluginNode() /** * Add the definitions for shared plugin configurations. * - * @param ArrayNodeDefinition $pluginNode The node to add to. + * @param ArrayNodeDefinition $pluginNode the node to add to * @param bool $disableAll Some shared plugins are enabled by default. On the client, all are disabled by default. */ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableAll = false) @@ -497,7 +497,7 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA /** * Create configuration for authentication plugin. * - * @return NodeDefinition Definition for the authentication node in the plugins list. + * @return NodeDefinition definition for the authentication node in the plugins list */ private function createAuthenticationPluginNode() { @@ -588,7 +588,7 @@ private function validateAuthenticationType(array $expected, array $actual, $aut /** * Create configuration for cache plugin. * - * @return NodeDefinition Definition for the cache node in the plugins list. + * @return NodeDefinition definition for the cache node in the plugins list */ private function createCachePluginNode() { diff --git a/DependencyInjection/HttplugExtension.php b/DependencyInjection/HttplugExtension.php index d00713d7..943d6259 100644 --- a/DependencyInjection/HttplugExtension.php +++ b/DependencyInjection/HttplugExtension.php @@ -142,7 +142,7 @@ private function configurePlugins(ContainerBuilder $container, array $config) * @param Definition $definition * @param array $config * @param ContainerBuilder $container In case we need to add additional services for this plugin - * @param string $serviceId Service id of the plugin, in case we need to add additional services for this plugin. + * @param string $serviceId service id of the plugin, in case we need to add additional services for this plugin */ private function configurePluginByName($name, Definition $definition, array $config, ContainerBuilder $container, $serviceId) { @@ -241,7 +241,7 @@ private function configurePluginByName($name, Definition $definition, array $con * @param ContainerBuilder $container * @param array $config * - * @return array List of service ids for the authentication plugins. + * @return array list of service ids for the authentication plugins */ private function configureAuthentication(ContainerBuilder $container, array $config, $servicePrefix = 'httplug.plugin.authentication') {