Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CS fixes.

Browse Source 
Plus add config for StyleCI.
This commit is contained in:
Justin Hileman
2015-03-02 21:53:03 -08:00
parent 4cd8521341
commit 22611a957c
18 changed files with 134 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.php_cs
+1 -1
View File
@@ -6,7 +6,7 @@ use Symfony\CS\FixerInterface;
$config = Config::create()
// use symfony level and extra fixers:
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers(array('-concat_without_spaces', 'concat_with_spaces', 'strict'))
->fixers(array('align_double_arrow', '-concat_without_spaces', 'concat_with_spaces', 'ordered_use', 'strict'))
->setUsingLinter(false);
$finder = $config->getFinder()
.styleci.yml
+10
View File
@@ -0,0 +1,10 @@
preset: symfony
enabled:
- align_double_arrow
- concat_with_spaces
- ordered_use
- strict
disabled:
- concat_without_spaces
bin/build_bootstrap.php
+1 -2
View File
@@ -12,7 +12,7 @@
/**
* A shell script to create a single-file class cache of the entire Mustache
* library:
* library.
*
* $ bin/build_bootstrap.php
*
@@ -72,7 +72,6 @@ SymfonyClassCollectionLoader::load(array(
* the unnecessary bits removed.
*
* @license http://www.opensource.org/licenses/MIT
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class SymfonyClassCollectionLoader
bin/create_example.php
+19 -10
View File
@@ -2,7 +2,7 @@
<?php
/**
* A commandline script to create an example and the needed files:
* A commandline script to create an example and the needed files.
*
* $ bin/create_example.php my_new_example
*
@@ -26,6 +26,7 @@ define('EXAMPLE_PATH', realpath(dirname(__FILE__) . '/../test/fixtures/examples'
/**
* transform a string to lowercase using underlines.
*
* Examples:
* String -> string
* AString -> a_string
@@ -34,6 +35,7 @@ define('EXAMPLE_PATH', realpath(dirname(__FILE__) . '/../test/fixtures/examples'
*
* @param string $name
* @access public
*
* @return string
*/
function getLowerCaseName($name)
@@ -45,7 +47,8 @@ function getLowerCaseName($name)
}
/**
* transform a string to Uppercase (camelcase)
* transform a string to Uppercase (camelcase).
*
* Examples
* string -> String
* a_string -> AString
@@ -54,6 +57,7 @@ function getLowerCaseName($name)
*
* @param string $name
* @access public
*
* @return string
*/
function getUpperCaseName($name)
@@ -65,10 +69,11 @@ function getUpperCaseName($name)
}
/**
* return the given value and echo it out appending "\n"
* return the given value and echo it out appending "\n".
*
* @param mixed $value
* @access public
*
* @return mixed
*/
function out($value)
@@ -79,15 +84,17 @@ function out($value)
}
/**
* create Path for certain files in an example
* create Path for certain files in an example.
*
* returns the directory name if only $directory is given.
* if an extension is given a complete filename is returned.
* the returned filename will be echoed out
* the returned filename will be echoed out.
*
* @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
*/
function buildPath($directory, $filename = null, $extension = null)
@@ -97,8 +104,9 @@ function buildPath($directory, $filename = null, $extension = null)
}
/**
* creates the directory for the example
* the script die()'s if mkdir() fails
* creates the directory for the example.
*
* the script die()'s if mkdir() fails.
*
* @param string $directory
* @access public
@@ -111,8 +119,9 @@ function createDirectory($directory)
}
/**
* create a file for the example with the given $content
* the script die()'s if fopen() fails
* create a file for the example with the given $content.
*
* the script die()'s if fopen() fails.
*
* @param string $directory directory without / at the end
* @param string $filename filename without path and extension
@@ -132,7 +141,7 @@ function createFile($directory, $filename, $extension, $content = "")
}
/**
* routine to create the example directory and 3 files
* routine to create the example directory and 3 files.
*
* if the $example_name is "SomeThing" the following files will be created
* examples/some_thing
src/Mustache/Cache/FilesystemCache.php
+3 -3
View File
@@ -56,7 +56,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
}
/**
* Cache and load the compiled class
* Cache and load the compiled class.
*
* @param string $key
* @param string $value
@@ -89,7 +89,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
}
/**
* Create cache directory
* Create cache directory.
*
* @throws Mustache_Exception_RuntimeException If unable to create directory
*
@@ -117,7 +117,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
}
/**
* Write cache file
* Write cache file.
*
* @throws Mustache_Exception_RuntimeException If unable to write file
*
src/Mustache/Loader/CascadingLoader.php
+1 -1
View File
@@ -18,7 +18,7 @@ class Mustache_Loader_CascadingLoader implements Mustache_Loader
private $loaders;
/**
* Construct a CascadingLoader with an array of loaders:
* Construct a CascadingLoader with an array of loaders.
*
* $loader = new Mustache_Loader_CascadingLoader(array(
* new Mustache_Loader_InlineLoader(__FILE__, __COMPILER_HALT_OFFSET__),
src/Mustache/Loader/InlineLoader.php
+1
View File
@@ -55,6 +55,7 @@ class Mustache_Loader_InlineLoader implements Mustache_Loader
/**
* The InlineLoader requires a filename and offset to process templates.
*
* The magic constants `__FILE__` and `__COMPILER_HALT_OFFSET__` are usually
* perfectly suited to the job:
*
src/Mustache/Logger.php
+2 -2
View File
@@ -10,7 +10,7 @@
*/
/**
* Describes a Mustache logger instance
* Describes a Mustache logger instance.
*
* This is identical to the Psr\Log\LoggerInterface.
*
@@ -29,7 +29,7 @@
interface Mustache_Logger
{
/**
* Psr\Log compatible log levels
* Psr\Log compatible log levels.
*/
const EMERGENCY = 'emergency';
const ALERT = 'alert';
src/Mustache/Template.php
+1 -1
View File
@@ -37,7 +37,7 @@ abstract class Mustache_Template
}
/**
* Mustache Template instances can be treated as a function and rendered by simply calling them:
* Mustache Template instances can be treated as a function and rendered by simply calling them.
*
* $m = new Mustache_Engine;
* $tpl = $m->loadTemplate('Hello, {{ name }}!');
test/Mustache/Test/EngineTest.php
+11 -11
View File
@@ -21,22 +21,22 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
$partialsLoader = new Mustache_Loader_ArrayLoader();
$mustache = new Mustache_Engine(array(
'template_class_prefix' => '__whot__',
'cache' => self::$tempDir,
'cache_file_mode' => 777,
'logger' => $logger,
'loader' => $loader,
'partials_loader' => $partialsLoader,
'partials' => array(
'cache' => self::$tempDir,
'cache_file_mode' => 777,
'logger' => $logger,
'loader' => $loader,
'partials_loader' => $partialsLoader,
'partials' => array(
'foo' => '{{ foo }}',
),
'helpers' => array(
'foo' => array($this, 'getFoo'),
'bar' => 'BAR',
),
'escape' => 'strtoupper',
'escape' => 'strtoupper',
'entity_flags' => ENT_QUOTES,
'charset' => 'ISO-8859-1',
'pragmas' => array(Mustache_Engine::PRAGMA_FILTERS),
'charset' => 'ISO-8859-1',
'pragmas' => array(Mustache_Engine::PRAGMA_FILTERS),
));
$this->assertSame($logger, $mustache->getLogger());
@@ -127,7 +127,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
{
$mustache = new Mustache_Engine(array(
'template_class_prefix' => '__whot__',
'cache' => self::$tempDir,
'cache' => self::$tempDir,
));
$source = '{{ foo }}';
@@ -140,7 +140,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
public function testLambdaCache()
{
$mustache = new MustacheStub(array(
'cache' => self::$tempDir,
'cache' => self::$tempDir,
'cache_lambda_templates' => true,
));
test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
+1 -1
View File
@@ -10,7 +10,7 @@
*/
/**
* A PHPUnit test case wrapping the Mustache Spec
* A PHPUnit test case wrapping the Mustache Spec.
*
* @group mustache-spec
* @group functional
test/Mustache/Test/Functional/InheritanceTest.php
+5 -5
View File
@@ -323,7 +323,7 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
public function testRecursionInInheritedTemplates()
{
$partials = array(
'include' => '{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}',
'include' => '{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}',
'include2' => '{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don\'t recurse{{/bar}}{{/include}}',
);
@@ -341,8 +341,8 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
public function testTopLevelSubstitutionsTakePrecedenceInMultilevelInheritance()
{
$partials = array(
'parent' => '{{<older}}{{$a}}p{{/a}}{{/older}}',
'older' => '{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}',
'parent' => '{{<older}}{{$a}}p{{/a}}{{/older}}',
'older' => '{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}',
'grandParent' => '{{$a}}g{{/a}}',
);
@@ -360,8 +360,8 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
public function testMultiLevelInheritanceNoSubChild()
{
$partials = array(
'parent' => '{{<older}}{{$a}}p{{/a}}{{/older}}',
'older' => '{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}',
'parent' => '{{<older}}{{$a}}p{{/a}}{{/older}}',
'older' => '{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}',
'grandParent' => '{{$a}}g{{/a}}',
);
test/Mustache/Test/Functional/MustacheSpecTest.php
+1 -1
View File
@@ -10,7 +10,7 @@
*/
/**
* A PHPUnit test case wrapping the Mustache Spec
* A PHPUnit test case wrapping the Mustache Spec.
*
* @group mustache-spec
* @group functional
test/Mustache/Test/ParserTest.php
+66 -66
View File
@@ -128,8 +128,8 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
Mustache_Tokenizer::LINE => 0,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'bar',
),
),
@@ -142,8 +142,8 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
Mustache_Tokenizer::LINE => 0,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'bar',
),
),
@@ -152,8 +152,8 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
array(
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => " ",
),
array(
@@ -161,8 +161,8 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
Mustache_Tokenizer::LINE => 0,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => " \n",
),
array(
@@ -203,65 +203,65 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
array(
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_PARENT,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_PARENT,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 8,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 16,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'baz',
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 19,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 27,
),
),
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_PARENT,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_PARENT,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 8,
Mustache_Tokenizer::END => 27,
Mustache_Tokenizer::END => 27,
Mustache_Tokenizer::NODES => array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_ARG,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_ARG,
Mustache_Tokenizer::NAME => 'bar',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 16,
Mustache_Tokenizer::END => 19,
Mustache_Tokenizer::END => 19,
Mustache_Tokenizer::NODES => array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'baz',
),
),
@@ -281,31 +281,31 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
Mustache_Tokenizer::LINE => 0,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'bar',
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 11,
),
),
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::END => 11,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::END => 11,
Mustache_Tokenizer::NODES => array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'bar',
),
),
@@ -406,16 +406,16 @@ class Mustache_Test_ParserTest extends PHPUnit_Framework_TestCase
Mustache_Tokenizer::LINE => 0,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => 'bar',
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'foo',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 11,
),
),
test/Mustache/Test/TokenizerTest.php
+5 -5
View File
@@ -279,11 +279,11 @@ class Mustache_Test_TokenizerTest extends PHPUnit_Framework_TestCase
null,
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'arg',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_BLOCK_VAR,
Mustache_Tokenizer::NAME => 'arg',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 8,
),
array(
test/fixtures/examples/dot_notation/DotNotation.php
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@
class DotNotation
{
public $person = array(
'name' => array('first' => 'Chris', 'last' => 'Firescythe'),
'age' => 24,
'name' => array('first' => 'Chris', 'last' => 'Firescythe'),
'age' => 24,
'hometown' => array(
'city' => 'Cincinnati',
'state' => 'OH',
test/fixtures/examples/i18n/I18n.php
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ class I18n
// A *very* small i18n dictionary :)
private static $dictionary = array(
'Hello.' => 'Hola.',
'Hello.' => 'Hola.',
'My name is {{ name }}.' => 'Me llamo {{ name }}.',
);
test/fixtures/examples/sections_nested/SectionsNested.php
Vendored
+3 -3
View File
@@ -8,7 +8,7 @@ class SectionsNested
{
return array(
array(
'name' => 'Von Kaiser',
'name' => 'Von Kaiser',
'enemies' => array(
array('name' => 'Super Macho Man'),
array('name' => 'Piston Honda'),
@@ -16,7 +16,7 @@ class SectionsNested
),
),
array(
'name' => 'Mike Tyson',
'name' => 'Mike Tyson',
'enemies' => array(
array('name' => 'Soda Popinski'),
array('name' => 'King Hippo'),
@@ -25,7 +25,7 @@ class SectionsNested
),
),
array(
'name' => 'Don Flamenco',
'name' => 'Don Flamenco',
'enemies' => array(
array('name' => 'Bald Bull'),
),