Skip to content

Commit dd277e8

Browse files
authored
Merge pull request #278 from php-http/pretty-ci
Use pretty-ci instead of style-ci
2 parents e198392 + 6204b46 commit dd277e8

File tree

6 files changed

+20
-30
lines changed

6 files changed

+20
-30
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.php_cs.cache
12
/behat.yml
23
/build/
34
/composer.lock

.php_cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

.php_cs.dist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->exclude('Resources')
5+
->exclude('vendor')
6+
->in(__DIR__)
7+
;
8+
9+
return PhpCsFixer\Config::create()
10+
->setRules([
11+
'@Symfony' => true,
12+
'array_syntax' => ['syntax' => 'short'],
13+
])
14+
->setFinder($finder);

.styleci.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

DependencyInjection/Configuration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ private function createClientPluginNode()
399399
/**
400400
* Add the definitions for shared plugin configurations.
401401
*
402-
* @param ArrayNodeDefinition $pluginNode The node to add to.
402+
* @param ArrayNodeDefinition $pluginNode the node to add to
403403
* @param bool $disableAll Some shared plugins are enabled by default. On the client, all are disabled by default.
404404
*/
405405
private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableAll = false)
@@ -497,7 +497,7 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA
497497
/**
498498
* Create configuration for authentication plugin.
499499
*
500-
* @return NodeDefinition Definition for the authentication node in the plugins list.
500+
* @return NodeDefinition definition for the authentication node in the plugins list
501501
*/
502502
private function createAuthenticationPluginNode()
503503
{
@@ -588,7 +588,7 @@ private function validateAuthenticationType(array $expected, array $actual, $aut
588588
/**
589589
* Create configuration for cache plugin.
590590
*
591-
* @return NodeDefinition Definition for the cache node in the plugins list.
591+
* @return NodeDefinition definition for the cache node in the plugins list
592592
*/
593593
private function createCachePluginNode()
594594
{

DependencyInjection/HttplugExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private function configurePlugins(ContainerBuilder $container, array $config)
142142
* @param Definition $definition
143143
* @param array $config
144144
* @param ContainerBuilder $container In case we need to add additional services for this plugin
145-
* @param string $serviceId Service id of the plugin, in case we need to add additional services for this plugin.
145+
* @param string $serviceId service id of the plugin, in case we need to add additional services for this plugin
146146
*/
147147
private function configurePluginByName($name, Definition $definition, array $config, ContainerBuilder $container, $serviceId)
148148
{
@@ -241,7 +241,7 @@ private function configurePluginByName($name, Definition $definition, array $con
241241
* @param ContainerBuilder $container
242242
* @param array $config
243243
*
244-
* @return array List of service ids for the authentication plugins.
244+
* @return array list of service ids for the authentication plugins
245245
*/
246246
private function configureAuthentication(ContainerBuilder $container, array $config, $servicePrefix = 'httplug.plugin.authentication')
247247
{

0 commit comments

Comments
 (0)