Merge branch '10.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

composer.json

@@ -120,12 +120,15 @@
         "psr/simple-cache-implementation": "1.0|2.0|3.0"
     },
     "conflict": {
+        "carbonphp/carbon-doctrine-types": "<3.0.0|>=4.0",
+        "doctrine/dbal": "<4.0.0|>=5.0",
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {
         "files": [
             "src/Illuminate/Collections/helpers.php",
             "src/Illuminate/Events/functions.php",
+            "src/Illuminate/Filesystem/functions.php",
             "src/Illuminate/Foundation/helpers.php",
             "src/Illuminate/Support/helpers.php"
         ],

src/Illuminate/Bus/DynamoBatchRepository.php

@@ -102,6 +102,7 @@ public function get($limit = 50, $before = null)
                 ':id' => array_filter(['S' => $before]),
             ]),
             'Limit' => $limit,
+            'ScanIndexForward' => false,
         ]);
 
         return array_map(

src/Illuminate/Cache/ArrayLock.php

@@ -87,6 +87,10 @@ public function release()
      */
     protected function getCurrentOwner()
     {
+        if (! $this->exists()) {
+            return null;
+        }
+
         return $this->store->locks[$this->name]['owner'];
     }
 

src/Illuminate/Collections/Arr.php

@@ -109,17 +109,17 @@ public static function divide($array)
      */
     public static function dot($array, $prepend = '')
     {
-        $results = [];
+        $results = [[]];
 
         foreach ($array as $key => $value) {
             if (is_array($value) && ! empty($value)) {
-                $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
+                $results[] = static::dot($value, $prepend.$key.'.');
             } else {
-                $results[$prepend.$key] = $value;
+                $results[] = [$prepend.$key => $value];
             }
         }
 
-        return $results;
+        return array_merge(...$results);
     }
 
     /**

src/Illuminate/Console/MigrationGeneratorCommand.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Filesystem\Filesystem;
 
+use function Illuminate\Filesystem\join_paths;
+
 abstract class MigrationGeneratorCommand extends Command
 {
     /**
@@ -102,7 +104,7 @@ protected function replaceMigrationPlaceholders($path, $table)
     protected function migrationExists($table)
     {
         return count($this->files->glob(
-            $this->laravel->joinPaths($this->laravel->databasePath('migrations'), '*_*_*_*_create_'.$table.'_table.php')
+            join_paths($this->laravel->databasePath('migrations'), '*_*_*_*_create_'.$table.'_table.php')
         )) !== 0;
     }
 }

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -583,7 +583,7 @@ public function quarterly()
      * Schedule the event to run quarterly on a given day and time.
      *
      * @param  int  $dayOfQuarter
-     * @param  int  $time
+     * @param  string  $time
      * @return $this
      */
     public function quarterlyOn($dayOfQuarter = 1, $time = '0:0')

src/Illuminate/Database/Console/TableCommand.php

@@ -212,7 +212,7 @@ protected function displayForCli(array $data)
             $columns->each(function ($column) {
                 $this->components->twoColumnDetail(
                     $column['column'].' <fg=gray>'.$column['attributes']->implode(', ').'</>',
-                    ($column['default'] ? '<fg=gray>'.$column['default'].'</> ' : '').''.$column['type'].''
+                    (! is_null($column['default']) ? '<fg=gray>'.$column['default'].'</> ' : '').''.$column['type'].''
                 );
             });
 

src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php

@@ -146,6 +146,31 @@ protected function compileJsonLength($column, $operator, $value)
         return 'json_array_length('.$field.$path.') '.$operator.' '.$value;
     }
 
+    /**
+     * Compile a "JSON contains" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @return string
+     */
+    protected function compileJsonContains($column, $value)
+    {
+        [$field, $path] = $this->wrapJsonFieldAndPath($column);
+
+        return 'exists (select 1 from json_each('.$field.$path.') where '.$this->wrap('json_each.value').' is '.$value.')';
+    }
+
+    /**
+     * Prepare the binding for a "JSON contains" statement.
+     *
+     * @param  mixed  $binding
+     * @return mixed
+     */
+    public function prepareBindingForJsonContains($binding)
+    {
+        return $binding;
+    }
+
     /**
      * Compile a "JSON contains key" statement into SQL.
      *

src/Illuminate/Database/Query/Processors/PostgresProcessor.php

@@ -107,7 +107,7 @@ public function processColumns($results)
             $autoincrement = $result->default !== null && str_starts_with($result->default, 'nextval(');
 
             return [
-                'name' => str_starts_with($result->name, '"') ? str_replace('"', '', $result->name) : $result->name,
+                'name' => $result->name,
                 'type_name' => $result->type_name,
                 'type' => $result->type,
                 'collation' => $result->collation,

src/Illuminate/Database/Query/Processors/SQLiteProcessor.php

@@ -36,7 +36,7 @@ public function processColumns($results)
 
             return [
                 'name' => $result->name,
-                'type_name' => strtok($type, '('),
+                'type_name' => strtok($type, '(') ?: '',
                 'type' => $type,
                 'collation' => null,
                 'nullable' => (bool) $result->nullable,