Update to latest php-cs-fixer config.
Update to corresponding style-ci config options. Fix a few code style issues in the process.
This commit is contained in:
@@ -6,10 +6,21 @@ use Symfony\CS\FixerInterface;
|
||||
$config = Config::create()
|
||||
// use symfony level and extra fixers:
|
||||
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
|
||||
->fixers(array('align_double_arrow', '-concat_without_spaces', 'concat_with_spaces', 'ordered_use', 'strict'))
|
||||
->fixers(array(
|
||||
'-concat_without_spaces',
|
||||
'-pre_increment',
|
||||
'-unalign_double_arrow',
|
||||
'-unalign_equals',
|
||||
'align_double_arrow',
|
||||
'concat_with_spaces',
|
||||
'ordered_use',
|
||||
'strict',
|
||||
))
|
||||
->setUsingLinter(false);
|
||||
|
||||
$finder = $config->getFinder()
|
||||
->in(__DIR__);
|
||||
->in('bin')
|
||||
->in('src')
|
||||
->in('test');
|
||||
|
||||
return $config;
|
||||
|
||||
@@ -8,3 +8,6 @@ enabled:
|
||||
|
||||
disabled:
|
||||
- concat_without_spaces
|
||||
- pre_increment
|
||||
- unalign_double_arrow
|
||||
- unalign_equals
|
||||
|
||||
@@ -34,7 +34,6 @@ define('EXAMPLE_PATH', realpath(dirname(__FILE__) . '/../test/fixtures/examples'
|
||||
* AStringMore -> a_string_more
|
||||
*
|
||||
* @param string $name
|
||||
* @access public
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
@@ -56,7 +55,6 @@ function getLowerCaseName($name)
|
||||
* a_string_more -> AStringMore -> a_string_more
|
||||
*
|
||||
* @param string $name
|
||||
* @access public
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
@@ -72,7 +70,6 @@ function getUpperCaseName($name)
|
||||
* return the given value and echo it out appending "\n".
|
||||
*
|
||||
* @param mixed $value
|
||||
* @access public
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
@@ -93,7 +90,6 @@ function out($value)
|
||||
* @param string $directory directory without / at the end
|
||||
* @param string $filename filename without path and extension
|
||||
* @param string $extension extension of the file without "."
|
||||
* @access public
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
@@ -109,7 +105,6 @@ function buildPath($directory, $filename = null, $extension = null)
|
||||
* the script die()'s if mkdir() fails.
|
||||
*
|
||||
* @param string $directory
|
||||
* @access public
|
||||
*/
|
||||
function createDirectory($directory)
|
||||
{
|
||||
@@ -127,7 +122,6 @@ function createDirectory($directory)
|
||||
* @param string $filename filename without path and extension
|
||||
* @param string $extension extension of the file without "."
|
||||
* @param string $content the content of the file
|
||||
* @access public
|
||||
*/
|
||||
function createFile($directory, $filename, $extension, $content = '')
|
||||
{
|
||||
@@ -150,7 +144,6 @@ function createFile($directory, $filename, $extension, $content = '')
|
||||
* examples/some_thing/SomeThing.php
|
||||
*
|
||||
* @param mixed $example_name
|
||||
* @access public
|
||||
*/
|
||||
function main($example_name)
|
||||
{
|
||||
|
||||
@@ -318,7 +318,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
|
||||
$mustache->render('{{ foo }}{{> bar }}', array('foo' => 'FOO'));
|
||||
$log = file_get_contents($name);
|
||||
$this->assertContains('DEBUG: Instantiating template: ', $log);
|
||||
$this->assertContains("WARNING: Partial not found: \"bar\"", $log);
|
||||
$this->assertContains('WARNING: Partial not found: "bar"', $log);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user