Skip to content

Use pretty-ci instead of style-ci #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 25, 2018
Merged

Use pretty-ci instead of style-ci #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7c28d
use prettyci instead of styleci
dbu Sep 24, 2018
6204b46
consistent dot at end of sentence
dbu Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.php_cs.cache
/behat.yml
/build/
/composer.lock
Expand Down
13 changes: 0 additions & 13 deletions .php_cs
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions .php_cs.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$finder = PhpCsFixer\Finder::create()
->exclude('Resources')
->exclude('vendor')
->in(__DIR__)
;

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder);
12 changes: 0 additions & 12 deletions .styleci.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down
4 changes: 2 additions & 2 deletions DependencyInjection/HttplugExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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')
{
Expand Down