From 52e0753736b95204623952be41d1b9dfd45cee59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Dec 2018 15:23:16 +0100 Subject: v2.9.0 --- php-doctrine-dbal-bin.patch | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'php-doctrine-dbal-bin.patch') diff --git a/php-doctrine-dbal-bin.patch b/php-doctrine-dbal-bin.patch index b16d61f..abb302e 100644 --- a/php-doctrine-dbal-bin.patch +++ b/php-doctrine-dbal-bin.patch @@ -1,15 +1,9 @@ -diff --git a/bin/doctrine-dbal.php b/bin/doctrine-dbal.php -index 3d1131f..f99b2da 100644 ---- a/bin/doctrine-dbal.php -+++ b/bin/doctrine-dbal.php -@@ -1,3 +1,4 @@ +diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php +--- ./bin/doctrine-dbal.php.rpm 2018-12-10 15:16:50.314834508 +0100 ++++ ./bin/doctrine-dbal.php 2018-12-10 15:16:54.519857316 +0100 +@@ -1,26 +1,21 @@ +#!/usr/bin/env php . - */ +require_once '/usr/share/php/Doctrine/Common/ClassLoader.php'; + @@ -19,13 +13,13 @@ index 3d1131f..f99b2da 100644 +$classLoaderSymfony = new \Doctrine\Common\ClassLoader('Symfony'); +$classLoaderSymfony->register(); + - use Symfony\Component\Console\Helper\HelperSet; use Doctrine\DBAL\Tools\Console\ConsoleRunner; + use Symfony\Component\Console\Helper\HelperSet; --$files = array(__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php'); +-$files = [__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php']; -$loader = null; $cwd = getcwd(); - $directories = array($cwd, $cwd . DIRECTORY_SEPARATOR . 'config'); + $directories = [$cwd, $cwd . DIRECTORY_SEPARATOR . 'config']; $configFile = null; -foreach ($files as $file) { @@ -36,7 +30,7 @@ index 3d1131f..f99b2da 100644 - } -} - --if ( ! $loader) { +-if (! $loader) { - throw new RuntimeException('vendor/autoload.php could not be found. Did you run `php composer.phar install`?'); -} - -- cgit