瀏覽代碼

[Finder] bypassed some code when possible

Fabien Potencier 13 年之前
父節點
當前提交
95a1902ea1

+ 1 - 1
src/Symfony/Component/Finder/Comparator/Comparator.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Finder\Comparator;
 /**
  * Comparator.
  *
- * @author Fabien Potencier <fabien@symfony.com> PHP port
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Comparator
 {

+ 1 - 1
src/Symfony/Component/Finder/Comparator/DateComparator.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Finder\Comparator;
 /**
  * DateCompare compiles date comparisons.
  *
- * @author Fabien Potencier <fabien@symfony.com> PHP port
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class DateComparator extends Comparator
 {

+ 23 - 21
src/Symfony/Component/Finder/Comparator/NumberComparator.php

@@ -25,7 +25,7 @@ namespace Symfony\Component\Finder\Comparator;
  *
  * Based on the Perl Number::Compare module.
  *
- * @author Fabien Potencier <fabien@symfony.com> PHP port
+ * @author     Fabien Potencier <fabien@symfony.com> PHP port
  * @author     Richard Clamp <richardc@unixbeard.net> Perl version
  * @copyright  2004-2005 Fabien Potencier <fabien@symfony.com>
  * @copyright  2002 Richard Clamp <richardc@unixbeard.net>
@@ -47,26 +47,28 @@ class NumberComparator extends Comparator
         }
 
         $target = $matches[2];
-        $magnitude = strtolower(isset($matches[3]) ? $matches[3] : '');
-        switch ($magnitude) {
-            case 'k':
-                $target *= 1000;
-                break;
-            case 'ki':
-                $target *= 1024;
-                break;
-            case 'm':
-                $target *= 1000000;
-                break;
-            case 'mi':
-                $target *= 1024*1024;
-                break;
-            case 'g':
-                $target *= 1000000000;
-                break;
-            case 'gi':
-                $target *= 1024*1024*1024;
-                break;
+        if (isset($matches[3])) {
+            // magnitude
+            switch (strtolower($matches[3])) {
+                case 'k':
+                    $target *= 1000;
+                    break;
+                case 'ki':
+                    $target *= 1024;
+                    break;
+                case 'm':
+                    $target *= 1000000;
+                    break;
+                case 'mi':
+                    $target *= 1024*1024;
+                    break;
+                case 'g':
+                    $target *= 1000000000;
+                    break;
+                case 'gi':
+                    $target *= 1024*1024*1024;
+                    break;
+            }
         }
 
         $this->setTarget($target);