update PHP-CS-Fixer to 1.0

This commit is contained in:
Dariusz Rumiński
2014-11-15 14:26:01 +01:00
parent fd8decb1ba
commit 74d5dc677c
4 changed files with 12 additions and 30 deletions
+2 -1
View File
@@ -1,3 +1,4 @@
.php_cs.cache
composer.lock composer.lock
vendor
mustache.php mustache.php
vendor
+8 -26
View File
@@ -1,34 +1,16 @@
<?php <?php
use Symfony\CS\Config\Config; use Symfony\CS\Config\Config;
use Symfony\CS\Fixer;
use Symfony\CS\FixerInterface; use Symfony\CS\FixerInterface;
$fixer = new Fixer(); $config = Config::create()
$fixer->registerBuiltInFixers(); // use default level and extra fixers:
->fixers(array('-concat_without_spaces', 'concat_with_spaces', 'strict', 'strict_param'))
->setUsingCache(true)
->setUsingLinter(false);
$fixers = array(); $config->getFinder()
->in(__DIR__)
foreach ($fixer->getFixers() as $fixer) { ->exclude('bin');
$level = $fixer->getLevel();
if (!isset($fixers[$level])) {
$fixers[$level] = array();
}
$fixers[$level][] = $fixer->getName();
}
$fixers = array_merge(
$fixers[FixerInterface::PSR0_LEVEL],
$fixers[FixerInterface::PSR1_LEVEL],
$fixers[FixerInterface::PSR2_LEVEL],
$fixers[FixerInterface::ALL_LEVEL],
array('concat_with_spaces', 'strict')
);
$config = new Config();
$config->fixers($fixers);
$config->getFinder()->in(__DIR__)->exclude('bin');
return $config; return $config;
+1 -1
View File
@@ -5,7 +5,7 @@ install:
script: script:
- phpunit - phpunit
- if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=');"` ]]; then php php-cs-fixer.phar --dry-run -v fix .; fi - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=');"` ]]; then php php-cs-fixer.phar --diff --dry-run -vv fix; fi
php: php:
- 5.2 - 5.2
@@ -268,8 +268,7 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
public function testInheritIndentationWhenOverridingAPartial() public function testInheritIndentationWhenOverridingAPartial()
{ {
$partials = array( $partials = array(
'partial' => 'partial' => 'stop:
'stop:
{{$nineties}}collaborate and listen{{/nineties}}', {{$nineties}}collaborate and listen{{/nineties}}',
); );