summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json10
-rw-r--r--php-doctrine-dbal3.spec27
2 files changed, 21 insertions, 16 deletions
diff --git a/composer.json b/composer.json
index ac7db5e..e1e1aab 100644
--- a/composer.json
+++ b/composer.json
@@ -35,21 +35,21 @@
"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": "10.0.0",
"jetbrains/phpstorm-stubs": "2022.2",
- "phpstan/phpstan": "1.8.3",
- "phpstan/phpstan-strict-rules": "^1.3",
- "phpunit/phpunit": "9.5.24",
+ "phpstan/phpstan": "1.8.10",
+ "phpstan/phpstan-strict-rules": "^1.4",
+ "phpunit/phpunit": "9.5.25",
"psalm/plugin-phpunit": "0.17.0",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0",
- "vimeo/psalm": "4.27.0"
+ "vimeo/psalm": "4.29.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 f1ef938..ae14522 100644
--- a/php-doctrine-dbal3.spec
+++ b/php-doctrine-dbal3.spec
@@ -12,8 +12,8 @@
%global github_owner doctrine
%global github_name dbal
-%global github_version 3.4.5
-%global github_commit a5a58773109c0abb13e658c8ccd92aeec8d07f9e
+%global github_version 3.5.1
+%global github_commit f38ee8aaca2d58ee88653cb34a6a3880c23f38a5
%global major 3
%global composer_vendor doctrine
@@ -24,9 +24,9 @@
# "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.24
+BuildRequires: phpunit9 >= 9.5.25
## 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',
@@ -290,6 +291,10 @@ exit $RETURN_CODE
%changelog
+* 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