geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-18 13:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  added PHP CS Fixer config
  fixed CS
This commit is contained in:
Fabien Potencier
2016-12-22 13:16:40 +01:00
parent af64acb714 9b31db1ee6
commit 8044631f0e
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.php_cs.dist
+14
View File
@@ -0,0 +1,14 @@
<?php
return PhpCsFixer\Config::create()
->setRules(array(
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => array('syntax' => 'long'),
'php_unit_fqcn_annotation' => false,
'no_unreachable_default_argument_value' => false,
'heredoc_to_nowdoc' => false,
))
->setRiskyAllowed(true)
->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
;
test/Twig/Tests/Cache/FilesystemTest.php
+4 -4
View File
@@ -65,13 +65,13 @@ class Twig_Tests_Cache_FilesystemTest extends PHPUnit_Framework_TestCase
$key = $this->directory.'/cache/cachefile.php';
$content = $this->generateSource();
$this->assertFalse(file_exists($key));
$this->assertFalse(file_exists($this->directory));
$this->assertFileNotExists($key);
$this->assertFileNotExists($this->directory);
$this->cache->write($key, $content);
$this->assertTrue(file_exists($this->directory));
$this->assertTrue(file_exists($key));
$this->assertFileExists($this->directory);
$this->assertFileExists($key);
$this->assertSame(file_get_contents($key), $content);
}