minor #18099 [Filesystem] Fix transient tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6a99db40dc85 · 2016-03-10T15:52:33.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Filesystem] Fix transient tests | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - time().mt_rand(0, 1000) is not enough... also adds a missing skip Commits ------- a6edd78 [Filesystem] Fix transient tests
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 
     public function prepare_workspace()
     {
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -48,7 +48,7 @@ protected function setUp()
     {
         $this->umask = umask(0);
         $this->filesystem = new Filesystem();
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -414,7 +414,10 @@ public function testFormatWithDateTimeZoneGmtOffset()
 
     public function testFormatWithIntlTimeZone()
     {
-        if (PHP_VERSION_ID < 50500 && !(extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('Extension intl is required.');
+        }
+        if (PHP_VERSION_ID < 50500 && !method_exists('IntlDateFormatter', 'setTimeZone')) {
             $this->markTestSkipped('Only in PHP 5.5+ IntlDateFormatter allows to use DateTimeZone objects.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase`
`22`	`22`
`23`	`23`	`public function prepare_workspace()`
`24`	`24`	`{`
`25`		`- $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);`
	`25`	`+ $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();`
`26`	`26`	`mkdir($this->workspace, 0777, true);`
`27`	`27`	`$this->workspace = realpath($this->workspace);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function setUp()`
`48`	`48`	`{`
`49`	`49`	`$this->umask = umask(0);`
`50`	`50`	`$this->filesystem = new Filesystem();`
`51`		`- $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);`
	`51`	`+ $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();`
`52`	`52`	`mkdir($this->workspace, 0777, true);`
`53`	`53`	`$this->workspace = realpath($this->workspace);`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,10 @@ public function testFormatWithDateTimeZoneGmtOffset()`
`414`	`414`
`415`	`415`	`public function testFormatWithIntlTimeZone()`
`416`	`416`	`{`
`417`		`- if (PHP_VERSION_ID < 50500 && !(extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {`
	`417`	`+ if (!extension_loaded('intl')) {`
	`418`	`+ $this->markTestSkipped('Extension intl is required.');`
	`419`	`+ }`
	`420`	`+ if (PHP_VERSION_ID < 50500 && !method_exists('IntlDateFormatter', 'setTimeZone')) {`
`418`	`421`	`$this->markTestSkipped('Only in PHP 5.5+ IntlDateFormatter allows to use DateTimeZone objects.');`
`419`	`422`	`}`
`420`	`423`