diff options
| -rw-r--r-- | composer.json | 25 | ||||
| -rw-r--r-- | php-doctrine-dbal3.spec | 69 |
2 files changed, 67 insertions, 27 deletions
diff --git a/composer.json b/composer.json index 17b1240..559cedd 100644 --- a/composer.json +++ b/composer.json @@ -31,25 +31,26 @@ {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "composer-runtime-api": "^2", "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3|^1", - "doctrine/event-manager": "^1.0", + "doctrine/event-manager": "^1|^2", "psr/cache": "^1|^2|^3", "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "9.0.0", - "jetbrains/phpstorm-stubs": "2022.1", - "phpstan/phpstan": "1.6.3", - "phpstan/phpstan-strict-rules": "^1.2", - "phpunit/phpunit": "9.5.20", - "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.2", - "symfony/cache": "^5.2|^6.0", - "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0", - "vimeo/psalm": "4.23.0" + "doctrine/coding-standard": "11.1.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2022.3", + "phpstan/phpstan": "1.10.9", + "phpstan/phpstan-strict-rules": "^1.5", + "phpunit/phpunit": "9.6.6", + "psalm/plugin-phpunit": "0.18.4", + "squizlabs/php_codesniffer": "3.7.2", + "symfony/cache": "^5.4|^6.0", + "symfony/console": "^4.4|^5.4|^6.0", + "vimeo/psalm": "4.30.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." diff --git a/php-doctrine-dbal3.spec b/php-doctrine-dbal3.spec index 9633901..74d86fd 100644 --- a/php-doctrine-dbal3.spec +++ b/php-doctrine-dbal3.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-doctrine-dbal3 # -# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2023 Shawn Iwinski <shawn.iwinski@gmail.com> # Adam Williamson <awilliam@redhat.com> # Remi Collet <remi@remirepo.net> # @@ -12,21 +12,21 @@ %global github_owner doctrine %global github_name dbal -%global github_version 3.3.6 -%global github_commit 9e7f76dd1cde81c62574fdffa5a9c655c847ad21 +%global github_version 3.6.2 +%global github_commit b4bd1cfbd2b916951696d82e57d054394d84864c %global major 3 %global composer_vendor doctrine %global composer_project dbal -# "php": "^7.3 || ^8" -%global php_min_ver 7.3 +# "php": "^7.4 || ^8" +%global php_min_ver 7.4 # "doctrine/cache": "^1.0|^2.0" %global doctrine_cache_min_ver 1.11 %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/event-manager": "^1|^2" +%global doctrine_event_min_ver 1 +%global doctrine_event_max_ver 3 # "doctrine/deprecations": "^0.5.3|^1", %global doctrine_deprecations_min_ver 0.5.3 %global doctrine_deprecations_max_ver 2 @@ -76,7 +76,7 @@ Patch0: %{name}-bin.patch BuildArch: noarch # Tests %if %{with tests} -BuildRequires: phpunit9 >= 9.5.16 +BuildRequires: phpunit9 >= 9.6.6 ## composer.json BuildRequires: php(language) >= %{php_min_ver} # remirepo:1 @@ -91,10 +91,10 @@ BuildRequires:(php-composer(symfony/cache) >= %{symfony_cache_min_ver} with php- BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) # remirepo:17 %else -BuildRequires: php-doctrine-cache >= %{doctrine_cache_min_ver} BuildRequires: php-doctrine-cache < %{doctrine_cache_max_ver} -BuildRequires: php-doctrine-event-manager >= %{doctrine_event_min_ver} +BuildRequires: php-doctrine-cache >= %{doctrine_cache_min_ver} BuildRequires: php-doctrine-event-manager < %{doctrine_event_max_ver} +BuildRequires: php-doctrine-event-manager >= %{doctrine_event_min_ver} BuildRequires: php-doctrine-deprecations < %{doctrine_deprecations_max_ver} BuildRequires: php-doctrine-deprecations >= %{doctrine_deprecations_min_ver} ## composer.json (optional) @@ -202,9 +202,10 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) { [ '%{phpdir}/Doctrine/Common/Cache2/autoload.php', '%{phpdir}/Doctrine/Common/Cache/autoload.php', - ], - '%{phpdir}/Doctrine/Common/EventManager/autoload.php', - [ + ], [ + '%{phpdir}/Doctrine/EventManager2/autoload.php', + '%{phpdir}/Doctrine/Common/EventManager/autoload.php', + ], [ '%{phpdir}/Psr/Cache3/autoload.php', '%{phpdir}/Psr/Cache2/autoload.php', '%{phpdir}/Psr/Cache/autoload.php', @@ -264,7 +265,7 @@ SKIP="--filter '^((?!(testFetchLongBlob)).)*$'" : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php php74 php80 php81; do +for PHP_EXEC in php php80 php81 php82; do rm -f /tmp/test_nesting.sqlite if which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit9 \ @@ -290,6 +291,44 @@ exit $RETURN_CODE %changelog +* Wed Apr 19 2023 Remi Collet <remi@remirepo.net> - 3.6.2-1 +- update to 3.6.2 + +* Mon Mar 6 2023 Remi Collet <remi@remirepo.net> - 3.6.1-1 +- update to 3.6.1 + +* Wed Feb 8 2023 Remi Collet <remi@remirepo.net> - 3.6.0-1 +- update to 3.6.0 + +* Thu Jan 12 2023 Remi Collet <remi@remirepo.net> - 3.5.3-1 +- update to 3.5.3 + +* Wed Dec 21 2022 Remi Collet <remi@remirepo.net> - 3.5.2-1 +- update to 3.5.2 + +* Mon Oct 24 2022 Remi Collet <remi@remirepo.net> - 3.5.1-1 +- update to 3.5.1 +- allow doctrine/event-manager 2 + +* Mon Sep 26 2022 Remi Collet <remi@remirepo.net> - 3.4.5-1 +- update to 3.4.5 + +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 3.4.4-1 +- update to 3.4.4 + +* Thu Aug 18 2022 Remi Collet <remi@remirepo.net> - 3.4.1-1 +- update to 3.4.1 + +* Mon Aug 8 2022 Remi Collet <remi@remirepo.net> - 3.4.0-1 +- update to 3.4.0 +- raise dependency on PHP 7.4 + +* Mon Aug 8 2022 Remi Collet <remi@remirepo.net> - 3.3.8-1 +- update to 3.3.8 + +* Fri Jun 24 2022 Remi Collet <remi@remirepo.net> - 3.3.7-1 +- update to 3.3.7 + * Tue May 3 2022 Remi Collet <remi@remirepo.net> - 3.3.6-1 - update to 3.3.6 - allow doctrine/deprecations 1 |