Merge branch '9.x'

# Conflicts:
#	CHANGELOG.md
#	src/Illuminate/Foundation/Application.php

Author: driesvints

.github/workflows/static-analysis.yml

@@ -47,6 +47,8 @@ jobs:
 
     name: Facade DocBlocks
 
+    if: ${{ github.repository_owner == 'laravel' && github.event_name == 'push' }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -65,5 +67,11 @@ jobs:
           max_attempts: 5
           command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
 
-      - name: Lint facade docblocks
-        run: php -f bin/facades.php -- --lint
+      - name: Update facade docblocks
+        run: php -f bin/facades.php
+
+      - name: Commit facade docblocks
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update facade docblocks
+          file_pattern: src/

.github/workflows/tests.yml

@@ -94,7 +94,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: random_secret
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: logs
           path: |
@@ -167,7 +167,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: random_secret
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: logs
           path: |

src/Illuminate/Collections/helpers.php

@@ -13,7 +13,7 @@
      * @param  \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue>|null  $value
      * @return \Illuminate\Support\Collection<TKey, TValue>
      */
-    function collect($value = null)
+    function collect($value = [])
     {
         return new Collection($value);
     }

src/Illuminate/Database/Schema/SqliteSchemaState.php

@@ -61,6 +61,12 @@ protected function appendMigrationData(string $path)
      */
     public function load($path)
     {
+        if ($this->connection->getDatabaseName() === ':memory:') {
+            $this->connection->getPdo()->exec($this->files->get($path));
+
+            return;
+        }
+
         $process = $this->makeProcess($this->baseCommand().' < "${:LARAVEL_LOAD_PATH}"');
 
         $process->mustRun(null, array_merge($this->baseVariables($this->connection->getConfig()), [

src/Illuminate/Routing/RouteRegistrar.php

@@ -184,7 +184,7 @@ public function apiSingleton($name, $controller, array $options = [])
     /**
      * Create a route group with shared attributes.
      *
-     * @param  \Closure|string  $callback
+     * @param  \Closure|array|string  $callback
      * @return $this
      */
     public function group($callback)

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -387,7 +387,7 @@ protected function storeVerbatimBlocks($value)
      */
     protected function storePhpBlocks($value)
     {
-        return preg_replace_callback('/(?<!@)@php(?! ?\()(.*?)@endphp/s', function ($matches) {
+        return preg_replace_callback('/(?<!@)@php(.*?)@endphp/s', function ($matches) {
             return $this->storeRawBlock("<?php{$matches[1]}?>");
         }, $value);
     }

tests/Database/DatabaseSqliteSchemaStateTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Illuminate\Tests\Database;
+
+use Illuminate\Database\Schema\SqliteSchemaState;
+use Illuminate\Database\SQLiteConnection;
+use Illuminate\Filesystem\Filesystem;
+use Mockery as m;
+use PDO;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\Process;
+
+class DatabaseSqliteSchemaStateTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        m::close();
+    }
+
+    public function testLoadSchemaToDatabase(): void
+    {
+        $config = ['driver' => 'sqlite', 'database' => 'database/database.sqlite', 'prefix' => '', 'foreign_key_constraints' => true, 'name' => 'sqlite'];
+        $connection = m::mock(SQLiteConnection::class);
+        $connection->shouldReceive('getConfig')->andReturn($config);
+        $connection->shouldReceive('getDatabaseName')->andReturn($config['database']);
+
+        $process = m::spy(Process::class);
+        $processFactory = m::spy(function () use ($process) {
+            return $process;
+        });
+
+        $schemaState = new SqliteSchemaState($connection, null, $processFactory);
+        $schemaState->load('database/schema/sqlite-schema.dump');
+
+        $processFactory->shouldHaveBeenCalled()->with('sqlite3 "${:LARAVEL_LOAD_DATABASE}" < "${:LARAVEL_LOAD_PATH}"');
+
+        $process->shouldHaveReceived('mustRun')->with(null, [
+            'LARAVEL_LOAD_DATABASE' => 'database/database.sqlite',
+            'LARAVEL_LOAD_PATH' => 'database/schema/sqlite-schema.dump',
+        ]);
+    }
+
+    public function testLoadSchemaToInMemory(): void
+    {
+        $config = ['driver' => 'sqlite', 'database' => ':memory:', 'prefix' => '', 'foreign_key_constraints' => true, 'name' => 'sqlite'];
+        $connection = m::mock(SQLiteConnection::class);
+        $connection->shouldReceive('getConfig')->andReturn($config);
+        $connection->shouldReceive('getDatabaseName')->andReturn($config['database']);
+        $connection->shouldReceive('getPdo')->andReturn($pdo = m::spy(PDO::class));
+
+        $files = m::mock(Filesystem::class);
+        $files->shouldReceive('get')->andReturn('CREATE TABLE IF NOT EXISTS "migrations" ("id" integer not null primary key autoincrement, "migration" varchar not null, "batch" integer not null);');
+
+        $schemaState = new SqliteSchemaState($connection, $files);
+        $schemaState->load('database/schema/sqlite-schema.dump');
+
+        $pdo->shouldHaveReceived('exec')->with('CREATE TABLE IF NOT EXISTS "migrations" ("id" integer not null primary key autoincrement, "migration" varchar not null, "batch" integer not null);');
+    }
+}

tests/View/Blade/BladePhpStatementsTest.php

@@ -84,11 +84,4 @@ public function testStringWithEscapingDataValue()
 
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
-
-    public function testCompilationOfMixedPhpStatements()
-    {
-        $string = '@php($set = true) @php ($hello = \'hi\') @php echo "Hello world" @endphp';
-        $expected = '<?php ($set = true); ?> <?php ($hello = \'hi\'); ?> <?php echo "Hello world" ?>';
-        $this->assertEquals($expected, $this->compiler->compileString($string));
-    }
 }