diff options
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | php-doctrine-dbal.spec | 20 |
2 files changed, 13 insertions, 8 deletions
diff --git a/composer.json b/composer.json index 662dbd8..fff4319 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ "jetbrains/phpstorm-stubs": "2020.2", "phpstan/phpstan": "0.12.81", "phpunit/phpunit": "^7.5.20|^8.5|9.5.0", + "squizlabs/php_codesniffer": "3.6.0", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "vimeo/psalm": "4.6.4" }, diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index 6d484b4..fc4ee61 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -16,8 +16,8 @@ %global github_owner doctrine %global github_name dbal -%global github_version 2.13.0 -%global github_commit 67d56d3203b33db29834e6b2fcdbfdc50535d796 +%global github_version 2.13.1 +%global github_commit c800380457948e65bbd30ba92cc17cda108bf8c9 %global composer_vendor doctrine %global composer_project dbal @@ -35,7 +35,7 @@ %global doctrine_deprecations_max_ver 1 # "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 %{!?phpdir: %global phpdir %{_datadir}/php} @@ -71,15 +71,15 @@ BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) # remirepo:11 %else -BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_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_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/console) < %{symfony_console_max_ver} +BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver} %endif ## phpcompatinfo (computed from version 2.12) BuildRequires: php-date @@ -111,8 +111,8 @@ Requires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_mi 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.12) @@ -179,7 +179,8 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) { \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', ], @@ -238,6 +239,9 @@ exit $RETURN_CODE %changelog +* 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 |