summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-05-23 11:13:24 +0200
committerRemi Collet <remi@php.net>2022-05-23 11:13:24 +0200
commit9695ba99d0864796b73839a6cb15a7f68ec2d91b (patch)
treec418a332268520fbcec3e59fae92e4ab2213bbef
parent2b752292911f4bfee7a8298c1fb06b18d074bcf4 (diff)
update to 1.13.0HEADmaster
-rw-r--r--composer.json13
-rw-r--r--php-doctrine-cache.spec17
2 files changed, 19 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index ddad5f4..bd337f9 100644
--- a/composer.json
+++ b/composer.json
@@ -28,13 +28,13 @@
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
"mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"predis/predis": "~1.0",
- "doctrine/coding-standard": "^8.0",
+ "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"
+ "symfony/cache": "^4.4 || ^5.4 || ^6",
+ "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
@@ -47,5 +47,10 @@
},
"autoload-dev": {
"psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/php-doctrine-cache.spec b/php-doctrine-cache.spec
index 0118783..bb41be3 100644
--- a/php-doctrine-cache.spec
+++ b/php-doctrine-cache.spec
@@ -12,8 +12,8 @@
%global github_owner doctrine
%global github_name cache
-%global github_version 1.12.1
-%global github_commit 4cf401d14df219fa6f38b671f5493449151c9ad8
+%global github_version 1.13.0
+%global github_commit 56cd022adb5514472cb144c087393c1821911d09
%global composer_vendor doctrine
%global composer_project cache
@@ -21,8 +21,8 @@
# "cache/integration-tests": "dev-master",
%global cache_integration_tests_min_ver 0.17
-# "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
-# "symfony/var-exporter": "^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 +56,7 @@ BuildArch: noarch
%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: phpunit9
+BuildRequires: phpunit9 >= 9.5
## phpcompatinfo (computed from version 1.7.1)
BuildRequires: php-date
BuildRequires: php-hash
@@ -71,7 +71,7 @@ BuildRequires: php-composer(fedora/autoloader)
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}
@@ -193,7 +193,7 @@ rm -f \
: 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
@@ -216,6 +216,9 @@ exit $RETURN_CODE
%changelog
+* Mon May 23 2022 Remi Collet <remi@remirepo.net> - 1.13.0-1
+- update to 1.13.0
+
* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 1.12.1-1
- update to 1.12.1
- allow psr/cache v3