diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | composer.json | 31 | ||||
| -rw-r--r-- | php-doctrine-dbal-bin.patch | 7 | ||||
| -rw-r--r-- | php-doctrine-dbal.spec | 153 |
4 files changed, 144 insertions, 49 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index 0c61fc4..fea8e41 100644 --- a/composer.json +++ b/composer.json @@ -32,20 +32,22 @@ {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} ], "require": { - "php": "^7.2", + "php": "^7.1 || ^8", "ext-pdo": "*", - "doctrine/cache": "^1.0", + "doctrine/cache": "^1.0|^2.0", + "doctrine/deprecations": "^0.5.3|^1", "doctrine/event-manager": "^1.0" }, "require-dev": { - "doctrine/coding-standard": "^8.1", - "jetbrains/phpstorm-stubs": "^2019.1", - "nikic/php-parser": "^4.4", - "phpstan/phpstan": "^0.12.40", - "phpunit/phpunit": "^8.5.5", - "psalm/plugin-phpunit": "^0.10.0", + "doctrine/coding-standard": "9.0.0", + "jetbrains/phpstorm-stubs": "2021.1", + "phpstan/phpstan": "1.4.6", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.16", + "psalm/plugin-phpunit": "0.16.1", + "squizlabs/php_codesniffer": "3.6.2", + "symfony/cache": "^4.4", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "^3.14.2" + "vimeo/psalm": "4.22.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -53,8 +55,9 @@ "bin": ["bin/doctrine-dbal"], "config": { "sort-packages": true, - "platform": { - "php": "7.2.0" + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "composer/package-versions-deprecated": true } }, "autoload": { @@ -62,11 +65,5 @@ }, "autoload-dev": { "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" } - }, - "extra": { - "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "3.0.x-dev" - } } } diff --git a/php-doctrine-dbal-bin.patch b/php-doctrine-dbal-bin.patch index abb302e..2d1269f 100644 --- a/php-doctrine-dbal-bin.patch +++ b/php-doctrine-dbal-bin.patch @@ -1,7 +1,7 @@ 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 @@ +--- ./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 @@ +#!/usr/bin/env php <?php @@ -13,6 +13,7 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php +$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; diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index fd00302..49853b4 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-dbal # -# Copyright (c) 2013-2020 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com> # Adam Williamson <awilliam@redhat.com> # # License: MIT @@ -11,31 +11,37 @@ # Please preserve changelog entries # +# Build using "--without tests" to disable tests +%bcond_without tests + %global github_owner doctrine %global github_name dbal -%global github_version 2.10.3 -%global github_commit 03ca23afc2ee062f5d3e32426ad37c34a4770dcf +%global github_version 2.13.9 +%global github_commit c480849ca3ad6706a39c970cdfe6888fa8a058b8 %global composer_vendor doctrine %global composer_project dbal -# "php": "^7.2" -%global php_min_ver 7.2 -# "doctrine/cache": "^1.0" +# "php": "^7.1 || ^8" +%global php_min_ver 7.1 +# "doctrine/cache": "^1.0|^2.0" %global doctrine_cache_min_ver 1.0 -%global doctrine_cache_max_ver 2 +%global doctrine_cache_max_ver 3 # "doctrine/event-manager": "^1.0" %global doctrine_event_min_ver 1.0 %global doctrine_event_max_ver 2 +# "doctrine/deprecations": "^0.5.3|^1", +%global doctrine_deprecations_min_ver 0.5.3 +%global doctrine_deprecations_max_ver 2 # "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" %global symfony_console_min_ver 2.0.5 -%global symfony_console_max_ver 5 +%global symfony_console_max_ver 6 +# "symfony/cache": "^4.4" +%global symfony_cache_min_ver 4.4 +%global symfony_cache_max_ver 5 %{!?phpdir: %global phpdir %{_datadir}/php} -# Build using "--without tests" to disable tests -%bcond_without tests - Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} Release: 1%{?github_release}%{?dist} @@ -56,28 +62,35 @@ Patch0: %{name}-bin.patch BuildArch: noarch # Tests %if %{with tests} -BuildRequires: phpunit8 >= 8.5.5 +BuildRequires: phpunit9 >= 9.5.16 ## composer.json BuildRequires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) +BuildRequires:(php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver}) BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_max_ver}) ## composer.json (optional) +BuildRequires:(php-composer(symfony/cache) >= %{symfony_cache_min_ver} with php-composer(symfony/cache) < %{symfony_cache_max_ver}) BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) -# remirepo:9 +# remirepo:13 %else -BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} -BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} +BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +BuildRequires: php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver} +BuildRequires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver} +BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} ## composer.json (optional) -BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver} +BuildRequires: php-composer(symfony/cache) < %{symfony_cache_max_ver} +BuildRequires: php-composer(symfony/cache) >= %{symfony_cache_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_console_max_ver} +BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver} %endif -## phpcompatinfo (computed from version 2.5.12) +## phpcompatinfo (computed from version 2.12) BuildRequires: php-date BuildRequires: php-json +BuildRequires: php-hash BuildRequires: php-pcre BuildRequires: php-pdo BuildRequires: php-reflection @@ -91,23 +104,27 @@ Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) +Requires: (php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver}) Requires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_max_ver}) # composer.json (optional) Requires: (php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) -# remirepo:9 +# remirepo:11 %else -Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} -Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} +Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +Requires: php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver} +Requires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} Requires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver} +Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} # composer.json (optional) -Requires: php-composer(symfony/console) >= %{symfony_console_min_ver} Requires: php-composer(symfony/console) < %{symfony_console_max_ver} +Requires: php-composer(symfony/console) >= %{symfony_console_min_ver} %endif Requires: php-pdo -# phpcompatinfo (computed from version 2.5.12) +# phpcompatinfo (computed from version 2.12) Requires: php-date Requires: php-json +Requires: php-hash Requires: php-pcre Requires: php-reflection Requires: php-spl @@ -156,16 +173,23 @@ cat <<'AUTOLOAD' | tee lib/Doctrine/DBAL/autoload.php */ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__); +if (!class_exists('Doctrine\\DBAL\\Connection')) { + \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__); +} -\Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/Doctrine/Common/Cache/autoload.php', +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/Doctrine/Common/Cache2/autoload.php', + '%{phpdir}/Doctrine/Common/Cache/autoload.php', + ], + '%{phpdir}/Doctrine/Deprecations/autoload.php', '%{phpdir}/Doctrine/Common/EventManager/autoload.php', -)); +]); \Fedora\Autoloader\Dependencies::optional([ [ - (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony4') . '/Component/Console/autoload.php', + (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony5') . '/Component/Console/autoload.php', + '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', '%{phpdir}/Symfony/Component/Console/autoload.php', ], @@ -186,18 +210,28 @@ install -pm 0755 bin/doctrine-dbal.php %{buildroot}/%{_bindir}/doctrine-dbal cat > bs.php <<'BOOTSTRAP' <?php require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Symfony4/Component/Cache/autoload.php', +]); \Fedora\Autoloader\Autoload::addPsr4( 'Doctrine\\Tests\\', __DIR__ . '/tests/Doctrine/Tests' ); BOOTSTRAP +%if 0%{?rhel} == 7 +SKIP="--filter '^((?!(testFetchAllKeyValueWithLimit|testFetchLongBlob)).)*$'" +%else +SKIP="--filter '^((?!(testFetchLongBlob)).)*$'" +%endif + : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php php72 php73 php74; do +for PHP_EXEC in php php74 php80 php81; do rm -f /tmp/test_nesting.sqlite if which $PHP_EXEC; then - $PHP_EXEC %{_bindir}/phpunit8 \ + $PHP_EXEC %{_bindir}/phpunit9 \ + $SKIP \ --bootstrap bs.php \ --verbose || RETURN_CODE=1 fi @@ -209,6 +243,7 @@ exit $RETURN_CODE %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -218,6 +253,66 @@ exit $RETURN_CODE %changelog +* Tue May 3 2022 Remi Collet <remi@remirepo.net> - 2.13.9-1 +- update to 2.13.9 +- allow doctrine/deprecations 1 + +* Thu Mar 10 2022 Remi Collet <remi@remirepo.net> - 2.13.8-1 +- update to 2.13.8 + +* Thu Jan 6 2022 Remi Collet <remi@remirepo.net> - 2.13.7-1 +- update to 2.13.7 + +* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 2.13.6-1 +- update to 2.13.6 + +* Mon Nov 15 2021 Remi Collet <remi@remirepo.net> - 2.13.5-1 +- update to 2.13.5 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.13.4-1 +- update to 2.13.4 + +* Mon Sep 13 2021 Remi Collet <remi@remirepo.net> - 2.13.3-1 +- update to 2.13.3 + +* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 2.13.2-1 +- update to 2.13.2 +- allow doctrine/cache version 2 + +* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 2.13.1-1 +- update to 2.13.1 + +* Tue Mar 30 2021 Remi Collet <remi@remirepo.net> - 2.13.0-1 +- update to 2.13.0 +- lower dependency on PHP 7.1 +- add dependency on doctrine/deprecations + +* Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 2.12.1-2 +- don't register autoloader twice, e.g. by doctrine/dbal v3 + +* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 2.12.1-1 +- update to 2.12.1 + +* Fri Oct 23 2020 Remi Collet <remi@remirepo.net> - 2.12.0-1 +- update to 2.12.0 + +* Wed Oct 21 2020 Remi Collet <remi@remirepo.net> - 2.11.3-1 +- update to 2.11.3 + +* Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 2.11.2-1 +- update to 2.11.2 + +* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 2.11.1-1 +- update to 2.11.1 + +* Mon Sep 21 2020 Remi Collet <remi@remirepo.net> - 2.11.0-1 +- update to 2.11.0 +- raise dependency on PHP 7.3 +- switch to phpunit9 + +* Mon Sep 14 2020 Remi Collet <remi@remirepo.net> - 2.10.4-1 +- update to 2.10.4 + * Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 2.10.3-1 - update to 2.10.3 |