fix whereNull, whereNotNull issue, fix some conditional issues and added some features

Author: nahid

examples/data1.json

@@ -18,11 +18,11 @@
 $jq = new Jsonq('data1.json');
 
 try {
-    $result = $jq->from('data')
-        //->where('user.id', '=', 345101090)
-//        ->sortBy('user.id', 'desc')
-        ->countGroupBy('user.id')
-        ->get();
+    $result = $jq->from('.')
+        //->whereContains('title', 'Day')
+        //->where('year', '>=', 2000)
+        ->countGroupBy('year')
+        ->avg();
     dump($result);
 } catch (\Nahid\JsonQ\Exceptions\ConditionNotAllowedException $e) {
 

examples/index.php

@@ -141,7 +141,7 @@ public static function notIn($value, $comparable)
      *
      * @return bool
      */
-    public static function isNull($value)
+    public static function isNull($value, $comparable)
     {
         return is_null($value);
     }
@@ -153,7 +153,7 @@ public static function isNull($value)
      *
      * @return bool
      */
-    public static function isNotNull($value)
+    public static function isNotNull($value, $comparable)
     {
         return !is_null($value);
     }

src/Condition.php

@@ -244,11 +244,16 @@ protected function exceptColumn($array)
      *
      * @param mixed $data
      * @param bool $isObject
-     * @return array
+     * @return array|mixed
      */
     protected function prepareResult($data, $isObject)
     {
         $output = [];
+
+        if (is_null($data) || is_scalar($data)) {
+            return $data;
+        }
+
         if ($this->isMultiArray($data)) {
             foreach ($data as $key => $val) {
                 $val = $this->takeColumn($val);
@@ -313,7 +318,7 @@ protected function getFromNested($map, $node)
             $path = explode('.', $node);
 
             foreach ($path as $val) {
-                if (!isset($map[$val])) {
+                if (!array_key_exists($val, $map)) {
                     $terminate = true;
                     break;
                 }
@@ -366,7 +371,7 @@ protected function processConditions()
                     }
 
                     $value = $this->getFromNested($val, $rule['key']);
-                    $return = $value ? call_user_func_array($function, [$value, $rule['value']]) : false;
+                    $return = $value === null || $value ? call_user_func_array($function, [$value, $rule['value']]) : false;
                     $tmp &= $return;
                 }
                 $res |= $tmp;
@@ -481,7 +486,7 @@ public function whereNotIn($key = null, $value = [])
      */
     public function whereNull($key = null)
     {
-        $this->where($key, 'null', null);
+        $this->where($key, 'null', 'null');
         return $this;
     }
 
@@ -493,7 +498,7 @@ public function whereNull($key = null)
      */
     public function whereNotNull($key = null)
     {
-        $this->where($key, 'notnull', null);
+        $this->where($key, 'notnull', 'null');
 
         return $this;
     }