diff options
| -rw-r--r-- | composer.json | 29 | ||||
| -rw-r--r-- | php-doctrine-dbal-bin.patch | 22 | ||||
| -rw-r--r-- | php-doctrine-dbal-phpunit54.patch | 22 | ||||
| -rw-r--r-- | php-doctrine-dbal.spec | 11 |
4 files changed, 32 insertions, 52 deletions
diff --git a/composer.json b/composer.json index 163d80a..9d5f610 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,18 @@ { "name": "doctrine/dbal", "type": "library", - "description": "Database Abstraction Layer", - "keywords": ["dbal", "database", "persistence", "queryobject"], - "homepage": "http://www.doctrine-project.org", + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "keywords": [ + "php", + "mysql", + "pgsql", + "dbal", + "database", + "abstraction", + "persistence", + "queryobject" + ], + "homepage": "https://www.doctrine-project.org/projects/dbal.html", "license": "MIT", "authors": [ {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"}, @@ -18,11 +27,10 @@ "doctrine/event-manager": "^1.0" }, "require-dev": { - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^5.0", "jetbrains/phpstorm-stubs": "^2018.1.2", "phpstan/phpstan": "^0.10.1", - "phpunit/phpunit": "^7.1.2", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", + "phpunit/phpunit": "^7.4", "symfony/console": "^2.0.5|^3.0|^4.0", "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, @@ -34,18 +42,15 @@ "sort-packages": true }, "autoload": { - "psr-0": { "Doctrine\\DBAL\\": "lib/" } + "psr-4": { "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" } }, "autoload-dev": { - "psr-0": { "Doctrine\\Tests\\": "tests/" } + "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" } }, "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", + "dev-master": "2.9.x-dev", "dev-develop": "3.0.x-dev" } - }, - "archive": { - "exclude": ["!vendor", "tests", "*phpunit.xml", ".appveyor.yml", ".travis.yml", "build.xml", "build.properties", "composer.phar"] } } 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 <?php - /* - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -@@ -17,27 +18,21 @@ - * <http://www.doctrine-project.org>. - */ +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`?'); -} - diff --git a/php-doctrine-dbal-phpunit54.patch b/php-doctrine-dbal-phpunit54.patch deleted file mode 100644 index 8c53d09..0000000 --- a/php-doctrine-dbal-phpunit54.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php.old 2016-06-13 17:57:43.021134891 +0200 -+++ tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php 2016-06-13 17:57:47.140157022 +0200 -@@ -275,7 +275,8 @@ - - $this->_sm->dropAndCreateTable($table); - -- $listenerMock = $this->getMock('ListTableColumnsDispatchEventListener', array('onSchemaColumnDefinition')); -+ $listenerMock = $this->getMockObjectGenerator()->getMock('ListTableColumnsDispatchEventListener', array('onSchemaColumnDefinition')); -+ $this->registerMockObject($listenerMock); - $listenerMock - ->expects($this->exactly(7)) - ->method('onSchemaColumnDefinition'); -@@ -300,7 +301,8 @@ - - $this->_sm->dropAndCreateTable($table); - -- $listenerMock = $this->getMock('ListTableIndexesDispatchEventListener', array('onSchemaIndexDefinition')); -+ $listenerMock = $this->getMockObjectGenerator()->getMock('ListTableIndexesDispatchEventListener', array('onSchemaIndexDefinition')); -+ $this->registerMockObject($listenerMock); - $listenerMock - ->expects($this->exactly(3)) - ->method('onSchemaIndexDefinition'); diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index 23940a7..8d6bcad 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name dbal -%global github_version 2.8.0 -%global github_commit 5140a64c08b4b607b9bedaae0cedd26f04a0e621 +%global github_version 2.9.0 +%global github_commit 21fdabe2fc01e004e1966f200d900554876bc63c %global composer_vendor doctrine %global composer_project dbal @@ -60,7 +60,7 @@ Patch0: %{name}-bin.patch BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: phpunit7 >= 7.1.2 +BuildRequires: phpunit7 >= 7.4 ## composer.json BuildRequires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -142,7 +142,7 @@ Autoloader: %{phpdir}/Doctrine/DBAL/autoload.php %setup -qn %{github_name}-%{github_commit} : Patch bin script -%patch0 -p1 +%patch0 -p1 -b .rpm : Remove empty file rm -f lib/Doctrine/DBAL/README.markdown @@ -221,6 +221,9 @@ exit $RETURN_CODE %changelog +* Mon Dec 10 2018 Remi Collet <remi@remirepo.net> - 2.9.0-1 +- update to 2.9.0 + * Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 2.8.0-1 - update to 2.8.0 - drop dependency on doctrine/common |