diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.5

Browse Source 
* 2.3:
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory

Conflicts:
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
This commit is contained in:
Fabien Potencier 2015-01-03 22:04:44 +01:00
commit 6b5cb6a3b8
10 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
View File

0
src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig → src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
View File

2
src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
View File

@ -42,7 +42,7 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
$loader = new StubFilesystemLoader(array( $loader = new StubFilesystemLoader(array(
__DIR__.'/../../Resources/views/Form', __DIR__.'/../../Resources/views/Form',
__DIR__, __DIR__.'/Fixtures/templates/form',
)); ));
$environment = new \Twig_Environment($loader, array('strict_variables' => true)); $environment = new \Twig_Environment($loader, array('strict_variables' => true));

2
src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
View File

@ -41,7 +41,7 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
$loader = new StubFilesystemLoader(array( $loader = new StubFilesystemLoader(array(
__DIR__.'/../../Resources/views/Form', __DIR__.'/../../Resources/views/Form',
__DIR__, __DIR__.'/Fixtures/templates/form',
)); ));
$environment = new \Twig_Environment($loader, array('strict_variables' => true)); $environment = new \Twig_Environment($loader, array('strict_variables' => true));

4
src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
View File

@ -13,6 +13,8 @@ namespace Symfony\Component\Filesystem\Tests;
class FilesystemTestCase extends \PHPUnit_Framework_TestCase class FilesystemTestCase extends \PHPUnit_Framework_TestCase
{ {
private $umask;
/** /**
* @var string $workspace * @var string $workspace
*/ */
@ -37,6 +39,7 @@ class FilesystemTestCase extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
$this->umask = umask(0);
$this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000); $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
mkdir($this->workspace, 0777, true); mkdir($this->workspace, 0777, true);
$this->workspace = realpath($this->workspace); $this->workspace = realpath($this->workspace);
@ -45,6 +48,7 @@ class FilesystemTestCase extends \PHPUnit_Framework_TestCase
public function tearDown() public function tearDown()
{ {
$this->clean($this->workspace); $this->clean($this->workspace);
umask($this->umask);
} }
/** /**