summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json19
-rw-r--r--php-doctrine-cache2.spec37
2 files changed, 29 insertions, 27 deletions
diff --git a/composer.json b/composer.json
index ddad5f4..3c8ca97 100644
--- a/composer.json
+++ b/composer.json
@@ -26,18 +26,12 @@
"php": "~7.1 || ^8.0"
},
"require-dev": {
- "alcaeus/mongo-php-adapter": "^1.1",
- "mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
- "predis/predis": "~1.0",
- "doctrine/coding-standard": "^8.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "doctrine/coding-standard": "^9",
"psr/cache": "^1.0 || ^2.0 || ^3.0",
"cache/integration-tests": "dev-master",
- "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
- "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
- },
- "suggest": {
- "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
+ "symfony/cache": "^4.4 || ^5.4 || ^6",
+ "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
@@ -47,5 +41,10 @@
},
"autoload-dev": {
"psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/php-doctrine-cache2.spec b/php-doctrine-cache2.spec
index e494d36..4b3d437 100644
--- a/php-doctrine-cache2.spec
+++ b/php-doctrine-cache2.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-doctrine-cache2
#
-# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com>
# Remi Collet <remi@fedoraproject.org>
#
# License: MIT
@@ -11,8 +11,8 @@
%global github_owner doctrine
%global github_name cache
-%global github_version 2.1.1
-%global github_commit 331b4d5dbaeab3827976273e9356b3b453c300ce
+%global github_version 2.2.0
+%global github_commit 1ca8f21980e770095a31456042471a57bc4c68fb
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global major 2
@@ -22,7 +22,8 @@
# "cache/integration-tests": "dev-master",
%global cache_integration_tests_min_ver 0.17
-# "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev"
+# "symfony/cache": "^4.4 || ^5.4 || ^6"
+# "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
%global symfony_min_ver 4.4
%global symfony_max_ver 7
@@ -56,7 +57,7 @@ BuildArch: noarch
%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: phpunit9
+BuildRequires: phpunit9 >= 9.5
## phpcompatinfo (computed from version 2.0.0)
BuildRequires: php-date
## Autoloader
@@ -64,10 +65,12 @@ BuildRequires: php-composer(fedora/autoloader)
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires:(php-composer(symfony/cache) >= %{symfony_min_ver} with php-composer(symfony/cache) < %{symfony_max_ver})
+BuildRequires:(php-composer(symfony/var-exporter) >= %{symfony_min_ver} with php-composer(symfony/var-exporter) < %{symfony_max_ver})
BuildRequires:(php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver})
-# remirepo:4
+# remirepo:5
%else
BuildRequires: php-symfony4-cache >= %{symfony_min_ver}
+BuildRequires: php-symfony4-var-exporter >= %{symfony_min_ver}
BuildRequires: php-psr-cache >= %{psr_cache_min_ver}
%endif
BuildRequires: php-composer(cache/integration-tests) >= %{cache_integration_tests_min_ver}
@@ -82,11 +85,12 @@ Requires: php-composer(fedora/autoloader)
# Weak dependencies
# remirepo:1
%if 0%{?fedora} > 21 || 0%{?rhel} >= 8
-Suggests: php-composer(alcaeus/mongo-php-adapter)
Requires: (php-composer(symfony/cache) >= %{symfony_min_ver} with php-composer(symfony/cache) < %{symfony_max_ver})
-# remirepo:3
+Requires: (php-composer(symfony/var-exporter) >= %{symfony_min_ver} with php-composer(symfony/var-exporter) < %{symfony_max_ver})
+# remirepo:4
%else
Requires: php-symfony4-cache >= %{symfony_min_ver}
+Requires: php-symfony4-var-exporter >= %{symfony_min_ver}
%endif
# Composer
@@ -123,16 +127,12 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
'%{phpdir}/Symfony6/Component/Cache/autoload.php',
'%{phpdir}/Symfony5/Component/Cache/autoload.php',
'%{phpdir}/Symfony4/Component/Cache/autoload.php',
+ ], [
+ '%{phpdir}/Symfony6/Component/VarExporter/autoload.php',
+ '%{phpdir}/Symfony5/Component/VarExporter/autoload.php',
+ '%{phpdir}/Symfony4/Component/VarExporter/autoload.php',
],
]);
-\Fedora\Autoloader\Dependencies::optional([
- '/usr/share/php/Alcaeus/MongoDbAdapter/autoload.php',
- '/usr/share/php/MongoDB/autoload.php',
- '/usr/share/pear/Predis/Autoloader.php',
-]);
-if (class_exists("Predis\\Autoloader")) {
- Predis\Autoloader::register();
-}
AUTOLOAD
@@ -167,7 +167,7 @@ rm tests/Doctrine/Tests/Common/Cache/Psr6/CacheAdapterTest.php
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in "" php73 php74 php80; do
+for PHP_EXEC in "" php74 php80 php81 php82; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit9 --bootstrap bootstrap.php \
--verbose || RETURN_CODE=1
@@ -190,6 +190,9 @@ exit $RETURN_CODE
%changelog
+* Mon May 23 2022 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- update to 2.2.0
+
* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 2.1.1-1
- update to 2.1.1