Skip to content

Commit

Permalink
Merge pull request ezsystems#29 from webhdx/EZEE-1446_phpcs
Browse files Browse the repository at this point in the history
EZEE-1446: Fix .php_cs config in EZEE repositories
  • Loading branch information
lserwatka committed Apr 11, 2017
2 parents 8e90859 + 2b66c4a commit d78c41d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
42 changes: 21 additions & 21 deletions .php_cs
@@ -1,29 +1,29 @@
<?php

return Symfony\CS\Config\Config::create()
->setUsingLinter(false)
->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers([
'concat_with_spaces',
'-concat_without_spaces',
'-empty_return',
'-phpdoc_params',
'-phpdoc_separation',
'-phpdoc_to_comment',
'-spaces_cast',
'-blankline_after_open_tag',
return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'concat_space' => ['spacing' => 'one'],
'array_syntax' => false,
'simplified_null_return' => false,
'phpdoc_align' => false,
'phpdoc_separation' => false,
'phpdoc_to_comment' => false,
'cast_spaces' => false,
'blank_line_after_opening_tag' => false,
'single_blank_line_before_namespace' => false,
'phpdoc_annotation_without_dot' => false,
'phpdoc_no_alias_tag' => false,
'space_after_semicolon' => false,
])
->finder(
Symfony\CS\Finder\DefaultFinder::create()
->setRiskyAllowed(true)
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude([
'vendor',
'bin/.ci',
'bin/.travis',
'doc',
'app/cache',
'ezpublish_legacy',
])
->files()->name('*.php')
)
;
;
1 change: 0 additions & 1 deletion bundle/Controller/LocationController.php
Expand Up @@ -13,7 +13,6 @@
use eZ\Publish\API\Repository\LocationService;
use eZ\Publish\Core\REST\Server\Controller;
use eZ\Publish\Core\REST\Server\Values;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareTrait;
use Symfony\Component\HttpFoundation\Request;

Expand Down
3 changes: 3 additions & 0 deletions composer.json
Expand Up @@ -19,6 +19,9 @@
"ezsystems/platform-ui-bundle": "^1.4",
"ezsystems/ezpublish-kernel": "^6.3"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.1"
},
"extra": {
"branch-alias": {
"dev-master": "0.1.x-dev"
Expand Down

0 comments on commit d78c41d

Please sign in to comment.