#9073 laravel update from 9.x to 10.x with database patch up

Author: touhidurabir

classes/core/PKPContainer.php

@@ -121,7 +121,8 @@ public function registerConfiguredProviders()
         $this->register(new LaravelEventServiceProvider($this));
         $this->register(new EventServiceProvider($this));
         $this->register(new LogServiceProvider($this));
-        $this->register(new \Illuminate\Database\DatabaseServiceProvider($this));
+        // $this->register(new \Illuminate\Database\DatabaseServiceProvider($this));
+        $this->register(new \PKP\core\database\PKPDatabaseServiceProvider($this));
         $this->register(new \Illuminate\Bus\BusServiceProvider($this));
         $this->register(new PKPQueueProvider($this));
         $this->register(new MailServiceProvider($this));

classes/core/database/PKPDatabaseConnectionFactory.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace PKP\core\database;
+
+use InvalidArgumentException;
+use Illuminate\Database\Connection;
+use Illuminate\Database\SQLiteConnection;
+use Illuminate\Database\SqlServerConnection;
+use Illuminate\Database\Connectors\ConnectionFactory;
+use PKP\core\database\connections\PKPMySqlConnection;
+use PKP\core\database\connections\PKPPostgresConnection;
+
+class PKPDatabaseConnectionFactory extends ConnectionFactory
+{
+    /**
+     * Create a new connection instance.
+     *
+     * @param  string  $driver
+     * @param  \PDO|\Closure  $connection
+     * @param  string  $database
+     * @param  string  $prefix
+     * @param  array  $config
+     * @return \Illuminate\Database\Connection
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function createConnection($driver, $connection, $database, $prefix = '', array $config = [])
+    {
+        if ($resolver = Connection::getResolver($driver)) {
+            return $resolver($connection, $database, $prefix, $config);
+        }
+
+        return match ($driver) {
+            'mysql' => new PKPMySqlConnection($connection, $database, $prefix, $config),
+            'pgsql' => new PKPPostgresConnection($connection, $database, $prefix, $config),
+            'sqlite' => new SQLiteConnection($connection, $database, $prefix, $config),
+            'sqlsrv' => new SqlServerConnection($connection, $database, $prefix, $config),
+            default => throw new InvalidArgumentException("Unsupported driver [{$driver}]."),
+        };
+    }
+}

classes/core/database/PKPDatabaseServiceProvider.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace PKP\core\database;
+
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\DatabaseServiceProvider;
+use PKP\core\database\PKPDatabaseConnectionFactory;
+use Illuminate\Database\DatabaseTransactionsManager;
+
+
+class PKPDatabaseServiceProvider extends DatabaseServiceProvider
+{
+    /**
+     * Register the primary database bindings.
+     *
+     * @return void
+     */
+    protected function registerConnectionServices()
+    {
+        // The connection factory is used to create the actual connection instances on
+        // the database. We will inject the factory into the manager so that it may
+        // make the connections while they are actually needed and not of before.
+        $this->app->singleton('db.factory', function ($app) {
+            return new PKPDatabaseConnectionFactory($app);
+        });
+
+        // The database manager is used to resolve various connections, since multiple
+        // connections might be managed. It also implements the connection resolver
+        // interface which may be used by other components requiring connections.
+        $this->app->singleton('db', function ($app) {
+            return new DatabaseManager($app, $app['db.factory']);
+        });
+
+        $this->app->bind('db.connection', function ($app) {
+            return $app['db']->connection();
+        });
+
+        $this->app->bind('db.schema', function ($app) {
+            return $app['db']->connection()->getSchemaBuilder();
+        });
+
+        $this->app->singleton('db.transactions', function ($app) {
+            return new DatabaseTransactionsManager;
+        });
+    }
+}

classes/core/database/connections/PKPMySqlConnection.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace PKP\core\database\connections;
+
+use Illuminate\Database\MySqlConnection;
+use PKP\core\database\traits\DBConnection;
+
+class PKPMySqlConnection extends MySqlConnection
+{
+    use DBConnection;
+}

classes/core/database/connections/PKPPostgresConnection.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace PKP\core\database\connections;
+
+use PKP\core\database\traits\DBConnection;
+use Illuminate\Database\PostgresConnection;
+
+class PKPPostgresConnection extends PostgresConnection
+{
+    use DBConnection;
+}

classes/core/database/traits/DBConnection.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace PKP\core\database\traits;
+
+use Illuminate\Database\Query\Grammars\MySqlGrammar;
+use Illuminate\Database\MySqlConnection;
+use Illuminate\Database\Query\Grammars\PostgresGrammar;
+use Illuminate\Database\Query\Expression;
+
+trait DBConnection
+{
+    /**
+     * Run a select statement against the database and returns a generator.
+     *
+     * @param  string  $query
+     * @param  array  $bindings
+     * @param  bool  $useReadPdo
+     * @return \Generator
+     */
+    public function cursor($query, $bindings = [], $useReadPdo = true)
+    {
+        $statement = $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo) {
+            if ($this->pretending()) {
+                return [];
+            }
+
+            if ($query instanceof Expression) {
+                $grammar = $this instanceof MySqlConnection
+                    ? new MySqlGrammar
+                    : new PostgresGrammar;
+                
+                $query = $query->getValue($grammar);
+            }
+
+            // First we will create a statement for the query. Then, we will set the fetch
+            // mode and prepare the bindings for the query. Once that's done we will be
+            // ready to execute the query against the database and return the cursor.
+
+            $statement = $this->prepared($this->getPdoForSelect($useReadPdo)
+                              ->prepare($query));
+
+            $this->bindValues(
+                $statement, $this->prepareBindings($bindings)
+            );
+
+            // Next, we'll execute the query against the database and return the statement
+            // so we can return the cursor. The cursor will use a PHP generator to give
+            // back one row at a time without using a bunch of memory to render them.
+            $statement->execute();
+
+            return $statement;
+        });
+
+        while ($record = $statement->fetch()) {
+            yield $record;
+        }
+    }
+}

classes/db/DAO.php

@@ -24,6 +24,9 @@
 namespace PKP\db;
 
 use Generator;
+use Illuminate\Database\Query\Grammars\MySqlGrammar;
+use Illuminate\Database\MySqlConnection;
+use Illuminate\Database\Query\Grammars\PostgresGrammar;
 use Illuminate\Support\Facades\DB;
 use PKP\cache\CacheManager;
 use PKP\core\JSONMessage;
@@ -74,7 +77,11 @@ public function retrieve($sql, $params = [], $callHooks = true)
             }
         }
 
-        return DB::cursor(DB::raw($sql)->getValue(), $params);
+        $grammar = DB::connection() instanceof MySqlConnection
+            ? new MySqlGrammar
+            : new PostgresGrammar;
+
+        return DB::cursor(DB::raw($sql)->getValue($grammar), $params);
     }
 
     /**

composer.json

@@ -12,7 +12,7 @@
 		"michelf/php-markdown": "1.*",
 		"slim/slim": "3.*",
 		"pimple/pimple": "3.*",
-		"laravel/framework": "^9.0",
+		"laravel/framework": "^10.0",
 		"firebase/php-jwt": "5.*",
 		"adodb/adodb-php": "v5.20.18",
 		"gettext/gettext": "5.*",