From 6309ffd1b7c678568705f1cf0fb5e44ea0fb3c22 Mon Sep 17 00:00:00 2001 From: Mikael Pajunen Date: Sat, 3 Jan 2015 11:52:38 +0200 Subject: [PATCH 1/5] Use $this->iniSet() in tests --- .../Component/Debug/Tests/DebugClassLoaderTest.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php index 396cc98ee9..775f3329c2 100644 --- a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php +++ b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php @@ -62,17 +62,14 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase public function testUnsilencing() { ob_start(); - $bak = array( - ini_set('log_errors', 0), - ini_set('display_errors', 1), - ); + + $this->iniSet('log_errors', 0); + $this->iniSet('display_errors', 1); // See below: this will fail with parse error // but this should not be @-silenced. @class_exists(__NAMESPACE__.'\TestingUnsilencing', true); - ini_set('log_errors', $bak[0]); - ini_set('display_errors', $bak[1]); $output = ob_get_clean(); $this->assertStringMatchesFormat('%aParse error%a', $output); From 0b775cd8ce9400e60a329ced3bb38796d40a7dad Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Jan 2015 19:21:43 +0100 Subject: [PATCH 2/5] [TwigBridge] moved fixtures into their own directory --- .../{ => Fixtures/templates/form}/child_label.html.twig | 0 .../{ => Fixtures/templates/form}/custom_widgets.html.twig | 0 .../templates/form}/page_dynamic_extends.html.twig | 0 .../{ => Fixtures/templates/form}/parent_label.html.twig | 0 .../Extension/{ => Fixtures/templates/form}/theme.html.twig | 0 .../{ => Fixtures/templates/form}/theme_extends.html.twig | 0 .../Extension/{ => Fixtures/templates/form}/theme_use.html.twig | 0 .../Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php | 2 +- .../Twig/Tests/Extension/FormExtensionTableLayoutTest.php | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/child_label.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/custom_widgets.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/page_dynamic_extends.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/parent_label.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme_extends.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme_use.html.twig (100%) diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php index f0e2cb3f88..d8ea90c45f 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php @@ -58,7 +58,7 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest $loader = new StubFilesystemLoader(array( __DIR__.'/../../Resources/views/Form', - __DIR__, + __DIR__.'/Fixtures/templates/form', )); $environment = new \Twig_Environment($loader, array('strict_variables' => true)); diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php index 99a782178a..16934440c5 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php @@ -57,7 +57,7 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest $loader = new StubFilesystemLoader(array( __DIR__.'/../../Resources/views/Form', - __DIR__, + __DIR__.'/Fixtures/templates/form', )); $environment = new \Twig_Environment($loader, array('strict_variables' => true)); From 1e547bebf4c847069db32cb4e1c362194e42fe72 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 3 Jan 2015 19:45:38 +0100 Subject: [PATCH 3/5] [Filesystem] enforce umask while testing --- src/Symfony/Component/Filesystem/Tests/FilesystemTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php index 9f918c7866..9dfff4fb21 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php @@ -18,6 +18,8 @@ use Symfony\Component\Filesystem\Filesystem; */ class FilesystemTest extends \PHPUnit_Framework_TestCase { + private $umask; + /** * @var string */ @@ -47,6 +49,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase public function setUp() { + $this->umask = umask(0); $this->filesystem = new Filesystem(); $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000); mkdir($this->workspace, 0777, true); @@ -56,6 +59,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase public function tearDown() { $this->clean($this->workspace); + umask($this->umask); } /** From 77c10e0363204f9cf77b8e16e92d2ba3ec1a91a5 Mon Sep 17 00:00:00 2001 From: mmoreram Date: Sat, 3 Jan 2015 19:59:26 +0100 Subject: [PATCH 4/5] Fixed minor typo - override --- .../Component/DependencyInjection/ExpressionLanguage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php index 8b236dbd5b..acc97bcf49 100644 --- a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php +++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php @@ -25,7 +25,7 @@ class ExpressionLanguage extends BaseExpressionLanguage { public function __construct(ParserCacheInterface $cache = null, array $providers = array()) { - // prepend the default provider to let users overide it easily + // prepend the default provider to let users override it easily array_unshift($providers, new ExpressionLanguageProvider()); parent::__construct($cache, $providers); From f14c7ca625bccc75ee918a2bc7722cada9f970a5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Jan 2015 21:59:06 +0100 Subject: [PATCH 5/5] fixed typo --- .../Security/Core/Authorization/ExpressionLanguage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php index ac6a03686e..c2925af871 100644 --- a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php +++ b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php @@ -25,7 +25,7 @@ class ExpressionLanguage extends BaseExpressionLanguage { public function __construct(ParserCacheInterface $cache = null, array $providers = array()) { - // prepend the default provider to let users overide it easily + // prepend the default provider to let users override it easily array_unshift($providers, new ExpressionLanguageProvider()); parent::__construct($cache, $providers);