symfony
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig renamed 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 renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig b/‎src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig renamed 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
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
Lines changed: 4 additions & 0 deletions
@@ -42,7 +42,7 @@ protected function setUp()
 
         $loader = new StubFilesystemLoader(array(
             __DIR__.'/../../Resources/views/Form',
-            __DIR__,
+            __DIR__.'/Fixtures/templates/form',
         ));
 
         $environment = new \Twig_Environment($loader, array('strict_variables' => true));
 
@@ -41,7 +41,7 @@ protected function setUp()
 
         $loader = new StubFilesystemLoader(array(
             __DIR__.'/../../Resources/views/Form',
-            __DIR__,
+            __DIR__.'/Fixtures/templates/form',
         ));
 
         $environment = new \Twig_Environment($loader, array('strict_variables' => true));
 
@@ -62,17 +62,14 @@ public function testIdempotence()
     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);
 
@@ -13,6 +13,8 @@
 
 class FilesystemTestCase extends \PHPUnit_Framework_TestCase
 {
+    private $umask;
+
     /**
      * @var string $workspace
      */
@@ -37,6 +39,7 @@ public static function setUpBeforeClass()
 
     public function setUp()
     {
+        $this->umask = umask(0);
         $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
@@ -45,6 +48,7 @@ public function setUp()
     public function tearDown()
     {
         $this->clean($this->workspace);
+        umask($this->umask);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`class FilesystemTestCase extends \PHPUnit_Framework_TestCase`
`15`	`15`	`{`
	`16`	`+ private $umask;`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* @var string $workspace`
`18`	`20`	`*/`
`@@ -37,6 +39,7 @@ public static function setUpBeforeClass()`
`37`	`39`
`38`	`40`	`public function setUp()`
`39`	`41`	`{`
	`42`	`+ $this->umask = umask(0);`
`40`	`43`	`$this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);`
`41`	`44`	`mkdir($this->workspace, 0777, true);`
`42`	`45`	`$this->workspace = realpath($this->workspace);`
`@@ -45,6 +48,7 @@ public function setUp()`
`45`	`48`	`public function tearDown()`
`46`	`49`	`{`
`47`	`50`	`$this->clean($this->workspace);`
	`51`	`+ umask($this->umask);`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`/**`