update PHP-CS-Fixer to 1.0
This commit is contained in:
+2
-1
@@ -1,3 +1,4 @@
|
||||
.php_cs.cache
|
||||
composer.lock
|
||||
vendor
|
||||
mustache.php
|
||||
vendor
|
||||
|
||||
@@ -1,34 +1,16 @@
|
||||
<?php
|
||||
|
||||
use Symfony\CS\Config\Config;
|
||||
use Symfony\CS\Fixer;
|
||||
use Symfony\CS\FixerInterface;
|
||||
|
||||
$fixer = new Fixer();
|
||||
$fixer->registerBuiltInFixers();
|
||||
$config = Config::create()
|
||||
// use default level and extra fixers:
|
||||
->fixers(array('-concat_without_spaces', 'concat_with_spaces', 'strict', 'strict_param'))
|
||||
->setUsingCache(true)
|
||||
->setUsingLinter(false);
|
||||
|
||||
$fixers = array();
|
||||
|
||||
foreach ($fixer->getFixers() as $fixer) {
|
||||
$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');
|
||||
$config->getFinder()
|
||||
->in(__DIR__)
|
||||
->exclude('bin');
|
||||
|
||||
return $config;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ install:
|
||||
|
||||
script:
|
||||
- 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:
|
||||
- 5.2
|
||||
|
||||
@@ -268,8 +268,7 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
|
||||
public function testInheritIndentationWhenOverridingAPartial()
|
||||
{
|
||||
$partials = array(
|
||||
'partial' =>
|
||||
'stop:
|
||||
'partial' => 'stop:
|
||||
{{$nineties}}collaborate and listen{{/nineties}}',
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user