Remove magic extract to use explicit array access to options

Author: GromNaN

src/Query/Builder.php

@@ -1182,40 +1182,38 @@ protected function compileWhereBetween(array $where): array
      */
     protected function compileWhereDate(array $where): array
     {
-        extract($where);
-
-        $startOfDay = new UTCDateTime(Carbon::parse($value)->startOfDay());
-        $endOfDay = new UTCDateTime(Carbon::parse($value)->endOfDay());
+        $startOfDay = new UTCDateTime(Carbon::parse($where['value'])->startOfDay());
+        $endOfDay = new UTCDateTime(Carbon::parse($where['value'])->endOfDay());
 
-        return match($operator) {
+        return match($where['operator']) {
             'eq', '=' => [
-                $column => [
+                $where['column'] => [
                     '$gte' => $startOfDay,
                     '$lte' => $endOfDay,
                 ],
             ],
             'ne' => [
                 '$or' => [
                     [
-                        $column => [
+                        $where['column'] => [
                             '$lt' => $startOfDay,
                         ],
                     ],
                     [
-                        $column => [
+                        $where['column'] => [
                             '$gt' => $endOfDay,
                         ],
                     ],
                 ],
             ],
             'lt', 'gte' => [
-                $column => [
-                    '$'.$operator => $startOfDay,
+                $where['column'] => [
+                    '$'.$where['operator'] => $startOfDay,
                 ],
             ],
             'gt', 'lte' => [
-                $column => [
-                    '$'.$operator => $endOfDay,
+                $where['column'] => [
+                    '$'.$where['operator'] => $endOfDay,
                 ],
             ],
         };
@@ -1227,17 +1225,13 @@ protected function compileWhereDate(array $where): array
      */
     protected function compileWhereMonth(array $where): array
     {
-        extract($where);
-
-        $value = (int) ltrim($value, '0');
-
         return [
             '$expr' => [
-                '$'.$operator => [
+                '$'.$where['operator'] => [
                     [
-                        '$month' => '$'.$column,
+                        '$month' => '$'.$where['column'],
                     ],
-                    $value,
+                    (int) $where['value'],
                 ],
             ],
         ];
@@ -1249,17 +1243,13 @@ protected function compileWhereMonth(array $where): array
      */
     protected function compileWhereDay(array $where): array
     {
-        extract($where);
-
-        $value = (int) ltrim($value, '0');
-
         return [
             '$expr' => [
-                '$'.$operator => [
+                '$'.$where['operator'] => [
                     [
-                        '$dayOfMonth' => '$'.$column,
+                        '$dayOfMonth' => '$'.$where['column'],
                     ],
-                    $value,
+                    (int) $where['value'],
                 ],
             ],
         ];
@@ -1271,17 +1261,13 @@ protected function compileWhereDay(array $where): array
      */
     protected function compileWhereYear(array $where): array
     {
-        extract($where);
-
-        $value = (int) $value;
-
         return [
             '$expr' => [
-                '$'.$operator => [
+                '$'.$where['operator'] => [
                     [
-                        '$year' => '$'.$column,
+                        '$year' => '$'.$where['column'],
                     ],
-                    $value,
+                    (int) $where['value'],
                 ],
             ],
         ];
@@ -1293,15 +1279,13 @@ protected function compileWhereYear(array $where): array
      */
     protected function compileWhereTime(array $where): array
     {
-        extract($where);
-
         return [
             '$expr' => [
-                '$'.$operator => [
+                '$'.$where['operator'] => [
                     [
-                        '$dateToString' => ['date' => '$'.$column, 'format' => '%H:%M:%S'],
+                        '$dateToString' => ['date' => '$'.$where['column'], 'format' => '%H:%M:%S'],
                     ],
-                    $value,
+                    $where['value'],
                 ],
             ],
         ];

tests/Models/Birthday.php

@@ -17,7 +17,7 @@ class Birthday extends Eloquent
 {
     protected $connection = 'mongodb';
     protected $collection = 'birthday';
-    protected $fillable = ['name', 'birthday', 'time'];
+    protected $fillable = ['name', 'birthday'];
 
     protected $casts = [
         'birthday' => 'datetime',