Datasources\ArraySource: Fixed & Improved

Author: o5

Grido/DataSources/ArraySource.php

@@ -62,7 +62,13 @@ protected function makeWhere(Condition $condition, array $data = NULL)
 
                 } else {
                     $i = count($condition->condition) > 1 ? $i : 0;
-                    $results[] = (int) $that->compare($row[$column], $condition->condition[$i], $condition->value[$i]);
+                    $results[] = (int) $that->compare(
+                        $row[$column],
+                        $condition->condition[$i],
+                        isset($condition->value[$i])
+                            ? $condition->value[$i]
+                            : NULL
+                    );
 
                     $i++;
                 }
@@ -94,6 +100,9 @@ public function compare($actual, $condition, $expected)
         } else if ($cond === '=') {
             return $actual == $expected;
 
+        } else if ($cond === '<>') {
+            return $actual != $expected;
+
         } elseif ($cond === 'IS NULL') {
             return $actual === NULL;
 

tests/Grido/DataSources/ArraySource.phpt

@@ -72,6 +72,9 @@ class ArraySourceTest extends DataSourceTestCase
         Assert::true($source->compare('Lucie', '=', 'Lucie'));
         Assert::false($source->compare('Lucie', '=', 'lucie'));
 
+        Assert::true($source->compare('Lucie', '<>', 'Petr'));
+        Assert::false($source->compare('Lucie', '<>', 'Lucie'));
+
         Assert::true($source->compare(NULL, 'IS NULL', NULL));
         Assert::false($source->compare('', 'IS NULL', NULL));