summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json12
-rw-r--r--php-doctrine-dbal.spec50
2 files changed, 42 insertions, 20 deletions
diff --git a/composer.json b/composer.json
index 943dcf0..163d80a 100644
--- a/composer.json
+++ b/composer.json
@@ -14,13 +14,16 @@
"require": {
"php": "^7.1",
"ext-pdo": "*",
- "doctrine/common": "^2.7.1"
+ "doctrine/cache": "^1.0",
+ "doctrine/event-manager": "^1.0"
},
"require-dev": {
"doctrine/coding-standard": "^4.0",
- "phpunit/phpunit": "^7.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",
- "symfony/console": "^2.0.5||^3.0",
+ "symfony/console": "^2.0.5|^3.0|^4.0",
"symfony/phpunit-bridge": "^3.4.5|^4.0.5"
},
"suggest": {
@@ -38,7 +41,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "3.0.x-dev"
}
},
"archive": {
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
index ed05f2a..23940a7 100644
--- a/php-doctrine-dbal.spec
+++ b/php-doctrine-dbal.spec
@@ -13,20 +13,23 @@
%global github_owner doctrine
%global github_name dbal
-%global github_version 2.7.2
-%global github_commit c0e5736016a51b427a8cba8bc470fbea78165819
+%global github_version 2.8.0
+%global github_commit 5140a64c08b4b607b9bedaae0cedd26f04a0e621
%global composer_vendor doctrine
%global composer_project dbal
# "php": "^7.1"
%global php_min_ver 7.1
-# "doctrine/common": "^2.7.1"
-%global doctrine_common_min_ver 2.7.1
-%global doctrine_common_max_ver 3.0
-# "symfony/console": "^2.0.5||^3.0"
+# "doctrine/cache": "^1.0"
+%global doctrine_cache_min_ver 1.0
+%global doctrine_cache_max_ver 2
+# "doctrine/event-manager": "^1.0"
+%global doctrine_event_min_ver 1.0
+%global doctrine_event_max_ver 2
+# "symfony/console": "^2.0.5|^3.0|^4.0"
%global symfony_console_min_ver 2.0.5
-%global symfony_console_max_ver 4.0
+%global symfony_console_max_ver 5
# "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
%global symfony_phpunit_min_ver 4.0.5
%global symfony_phpunit_max_ver 5.0
@@ -57,17 +60,20 @@ Patch0: %{name}-bin.patch
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: phpunit7
+BuildRequires: phpunit7 >= 7.1.2
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:(php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_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/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver})
BuildRequires:(php-composer(symfony/phpunit-bridge) >= %{symfony_phpunit_min_ver} with php-composer(symfony/phpunit-bridge) < %{symfony_phpunit_max_ver})
%else
-BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
-BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver}
+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/event-manager) < %{doctrine_event_max_ver}
BuildRequires: php-symfony4-phpunit-bridge
## composer.json (optional)
BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver}
@@ -87,12 +93,15 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+Requires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_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})
%else
-Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
-Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver}
+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/event-manager) < %{doctrine_event_max_ver}
# composer.json (optional)
Requires: php-composer(symfony/console) >= %{symfony_console_min_ver}
Requires: php-composer(symfony/console) < %{symfony_console_max_ver}
@@ -152,12 +161,14 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__);
\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Doctrine/Common/autoload.php',
+ '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+ '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
));
\Fedora\Autoloader\Dependencies::optional([
[
- (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony3') . '/Component/Console/autoload.php',
+ (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony4') . '/Component/Console/autoload.php',
+ '%{phpdir}/Symfony3/Component/Console/autoload.php',
'%{phpdir}/Symfony/Component/Console/autoload.php',
],
]);
@@ -210,6 +221,13 @@ exit $RETURN_CODE
%changelog
+* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- update to 2.8.0
+- drop dependency on doctrine/common
+- add dependency on doctrine/cache
+- add dependency on doctrine/event-manager
+- allow Symfony 4
+
* Wed Oct 17 2018 Remi Collet <remi@remirepo.net> - 2.7.2-1
- update to 2.7.2
- raise dependencies on PHP 7.1
generated by cgit (git 2.34.1) at 2024-11-17 17:58:13 +0000