[TESTS] Backport r18516 (Zend_Version updates) to trunk

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18523 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Version.php

@@ -46,6 +46,8 @@ final class Zend_Version
      */
     public static function compareVersion($version)
     {
-        return version_compare($version, self::VERSION);
+        $version = strtolower($version);
+        $version = preg_replace('/(\d)pr(\d?)/', '$1a$2', $version);
+        return version_compare($version, strtolower(self::VERSION));
     }
 }

tests/Zend/VersionTest.php

@@ -61,22 +61,21 @@ class Zend_VersionTest extends PHPUnit_Framework_TestCase
         for ($i=0; $i <= 1; $i++) {
             for ($j=0; $j < 10; $j++) {
                 for ($k=0; $k < 20; $k++) {
-                    foreach (array('PR', 'dev', 'alpha', 'a1', 'a2', 'beta', 'b1', 'b2', 'RC', 'RC1', 'RC2', 'RC3', '', 'pl') as $rel) {
+                    foreach (array('dev', 'pr', 'PR', 'alpha', 'a1', 'a2', 'beta', 'b1', 'b2', 'RC', 'RC1', 'RC2', 'RC3', '', 'pl1', 'PL1') as $rel) {
                         $ver = "$i.$j.$k$rel";
-                        if ($ver === Zend_Version::VERSION
-                            || "$i.$j.$k-$rel" === Zend_Version::VERSION
-                            || "$i.$j.$k.$rel" === Zend_Version::VERSION
-                            || "$i.$j.$k $rel" === Zend_Version::VERSION) {
-
-                            if ($expect != -1) {
-                                $this->fail("Unexpected double match for Zend_Version::VERSION ("
-                                    . Zend_Version::VERSION . ")");
-                            }
-                            else {
+                        $normalizedVersion = strtolower(Zend_Version::VERSION);
+                        if (strtolower($ver) === $normalizedVersion
+                            || strtolower("$i.$j.$k-$rel") === $normalizedVersion
+                            || strtolower("$i.$j.$k.$rel") === $normalizedVersion
+                            || strtolower("$i.$j.$k $rel") === $normalizedVersion
+                        ) {
+                            if ($expect == -1) {
                                 $expect = 1;
                             }
                         } else {
-                            $this->assertSame(Zend_Version::compareVersion($ver), $expect,
+                            $this->assertSame(
+                                Zend_Version::compareVersion($ver), 
+                                $expect,
                                 "For version '$ver' and Zend_Version::VERSION = '"
                                 . Zend_Version::VERSION . "': result=" . (Zend_Version::compareVersion($ver))
                                 . ', but expected ' . $expect);
@@ -86,7 +85,7 @@ class Zend_VersionTest extends PHPUnit_Framework_TestCase
             }
         }
         if ($expect === -1) {
-            $this->fail('Unable to recognize Zend_Version::VERSION ('. Zend_Version::VERSION . ')');
+            $this->fail('Unable to recognize Zend_Version::VERSION ('. Zend_Version::VERSION . '); last version compared: ' . $ver);
         }
     }