[ClassLoader] Fixed version compare

hason · hason · commit 1ec075d7c9fd · 2012-03-09T08:17:46.000+01:00
diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -84,7 +84,7 @@ static private function findClasses($path)
     {
         $contents = file_get_contents($path);
         $tokens   = token_get_all($contents);
-        $T_TRAIT  = version_compare(PHP_VERSION, '5.4.0RC1', '<') ? -1 : T_TRAIT;
+        $T_TRAIT  = version_compare(PHP_VERSION, '5.4', '<') ? -1 : T_TRAIT;
 
         $classes = array();
 
diff --git a/tests/Symfony/Tests/Component/ClassLoader/ClassMapGeneratorTest.php b/tests/Symfony/Tests/Component/ClassLoader/ClassMapGeneratorTest.php
@@ -56,7 +56,7 @@ public function getTestCreateMapTests()
             )),
         );
 
-        if (version_compare(PHP_VERSION, '5.4.0RC1', '>=')) {
+        if (version_compare(PHP_VERSION, '5.4', '>=')) {
             $data[] = array(__DIR__.'/Fixtures/php5.4', array(
                 'TFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
                 'CFoo' => __DIR__.'/Fixtures/php5.4/traits.php',

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static private function findClasses($path)`
`84`	`84`	`{`
`85`	`85`	`$contents = file_get_contents($path);`
`86`	`86`	`$tokens = token_get_all($contents);`
`87`		`- $T_TRAIT = version_compare(PHP_VERSION, '5.4.0RC1', '<') ? -1 : T_TRAIT;`
	`87`	`+ $T_TRAIT = version_compare(PHP_VERSION, '5.4', '<') ? -1 : T_TRAIT;`
`88`	`88`
`89`	`89`	`$classes = array();`
`90`	`90`