diff options
Diffstat (limited to 'php-doctrine-dbal3-bin.patch')
| -rw-r--r-- | php-doctrine-dbal3-bin.patch | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/php-doctrine-dbal3-bin.patch b/php-doctrine-dbal3-bin.patch index 2d1269f..0f12483 100644 --- a/php-doctrine-dbal3-bin.patch +++ b/php-doctrine-dbal3-bin.patch @@ -1,24 +1,16 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php ---- ./bin/doctrine-dbal.php.rpm 2020-09-21 12:14:14.995837618 +0200 -+++ ./bin/doctrine-dbal.php 2020-09-21 12:16:37.888455856 +0200 -@@ -1,27 +1,22 @@ +--- ./bin/doctrine-dbal.php.rpm 2020-11-16 12:02:16.000000000 +0100 ++++ ./bin/doctrine-dbal.php 2020-11-16 12:21:56.895094784 +0100 +@@ -1,25 +1,14 @@ +#!/usr/bin/env php <?php -+require_once '/usr/share/php/Doctrine/Common/ClassLoader.php'; -+ -+$classLoaderDoctrine = new \Doctrine\Common\ClassLoader('Doctrine'); -+$classLoaderDoctrine->register(); -+ -+$classLoaderSymfony = new \Doctrine\Common\ClassLoader('Symfony'); -+$classLoaderSymfony->register(); -+ - use Doctrine\DBAL\Tools\Console\ConnectionProvider; use Doctrine\DBAL\Tools\Console\ConsoleRunner; - use Symfony\Component\Console\Helper\HelperSet; -$files = [__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php']; -$loader = null; ++require '/usr/share/php/Doctrine/DBAL3/autoload.php'; ++ $cwd = getcwd(); $directories = [$cwd, $cwd . DIRECTORY_SEPARATOR . 'config']; $configFile = null; @@ -38,3 +30,25 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php foreach ($directories as $directory) { $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php'; +diff -up ./src/Tools/Console/ConsoleRunner.php.rpm ./src/Tools/Console/ConsoleRunner.php +--- ./src/Tools/Console/ConsoleRunner.php.rpm 2020-11-16 12:07:38.948729149 +0100 ++++ ./src/Tools/Console/ConsoleRunner.php 2020-11-16 12:08:24.685526402 +0100 +@@ -5,7 +5,6 @@ namespace Doctrine\DBAL\Tools\Console; + use Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand; + use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand; + use Exception; +-use PackageVersions\Versions; + use Symfony\Component\Console\Application; + use Symfony\Component\Console\Command\Command; + +@@ -25,9 +24,7 @@ class ConsoleRunner + */ + public static function run(ConnectionProvider $connectionProvider, $commands = []) + { +- $cli = new Application('Doctrine Command Line Interface', Versions::getVersion( +- Versions::rootPackageName() +- )); ++ $cli = new Application('Doctrine Command Line Interface', '@VERSION@'); + + $cli->setCatchExceptions(true); + self::addCommands($cli, $connectionProvider); |