Fix a lime comparison bug

The false positives we fix:
- 0 was equal to any non-empty string
- true was equal to any non-empty string

Additionally change the lime unit test to reflect the new behavior.

Author: e1himself

lib/vendor/lime/lime.php

@@ -190,6 +190,29 @@ public function ok($exp, $message = '')
     return $result;
   }
 
+  /**
+   * Compares two values and returns true if they are equal
+   *
+   * @param mixed  $exp1    left value
+   * @param mixed  $exp2    right value
+   * @return bool
+   */
+  private function equals($exp1, $exp2)
+  {
+    if (is_object($exp1) || is_object($exp2)) {
+      $value = $exp1 === $exp2;
+    } else if (is_float($exp1) && is_float($exp2)) {
+      $value = abs($exp1 - $exp2) < self::EPSILON;
+    } else if (is_string($exp1) && is_numeric($exp1) || is_string($exp2) && is_numeric($exp2)) {
+      return $exp1 == $exp2;
+    } else if (is_string($exp1) || is_string($exp2)) {
+      return (string) $exp1 === (string) $exp2;
+    } else {
+      $value = $exp1 == $exp2;
+    }
+    return $value;
+  }
+
   /**
    * Compares two values and passes if they are equal (==)
    *
@@ -201,18 +224,7 @@ public function ok($exp, $message = '')
    */
   public function is($exp1, $exp2, $message = '')
   {
-    if (is_object($exp1) || is_object($exp2))
-    {
-      $value = $exp1 === $exp2;
-    }
-    else if (is_float($exp1) && is_float($exp2))
-    {
-      $value = abs($exp1 - $exp2) < self::EPSILON;
-    }
-    else
-    {
-      $value = $exp1 == $exp2;
-    }
+    $value = $this->equals($exp1, $exp2);
 
     if (!$result = $this->ok($value, $message))
     {
@@ -233,9 +245,11 @@ public function is($exp1, $exp2, $message = '')
    */
   public function isnt($exp1, $exp2, $message = '')
   {
-    if (!$result = $this->ok($exp1 != $exp2, $message))
+    $value = $this->equals($exp1, $exp2);
+
+    if (!$result = $this->ok(!$value, $message))
     {
-      $this->set_last_test_errors(array(sprintf("      %s", var_export($exp2, true)), '          ne', sprintf("      %s", var_export($exp2, true))));
+      $this->set_last_test_errors(array(sprintf("      %s", var_export($exp1, true)), '          ne', sprintf("      %s", var_export($exp2, true))));
     }
 
     return $result;

test/unit/test/limeTestTest.php

@@ -16,7 +16,7 @@
 $t->is('aaa', 'aaa');
 $t->is("\0", "\0");
 
-$t->comment('C. Equivalent number <-> strings');
+$t->comment('C. Equivalent number <-> numeric string');
 $t->is('0', 0);
 $t->is('1', 1);
 $t->is('-1', -1);
@@ -30,10 +30,9 @@
 $t->isnt(-2, 'Hello');
 $t->isnt(100, array(100));
 
-$t->comment('E. Equivalent falsy');
+$t->comment('E. Both falsy');
 $t->is(0, false);
 $t->is(0, null);
-$t->is('', 0);
 $t->is('', false);
 $t->is(false, null);
 $t->is(array(), null);
@@ -43,3 +42,4 @@
 $t->isnt('Hello', true);
 $t->isnt('Hello', 0);
 $t->isnt(0, 'Hello');
+$t->isnt('', 0);