summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-27 15:32:12 +0100
committerRemi Collet <remi@php.net>2022-01-27 15:32:12 +0100
commitb91e8155add16b99e582ff76e20e72aae6bb0774 (patch)
tree02e4c9e49700dfa84ef8b3c9726ac0bcc7391064
parent7bc7e307e28c5b9ce97c9c80f01e7c9a1c62e11d (diff)
update to 2.3.5HEADmaster
add build dependency on symfony/cache ignore 1 failed test with 8.1, FTBFS #2046815
-rw-r--r--composer.json1
-rw-r--r--php-doctrine-migrations.spec24
2 files changed, 20 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 1fdf4a4..a154ef8 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,7 @@
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+ "symfony/cache": "^4.4. || ^5.3",
"symfony/process": "^3.4||^4.0||^5.0",
"symfony/yaml": "^3.4||^4.0||^5.0"
},
diff --git a/php-doctrine-migrations.spec b/php-doctrine-migrations.spec
index 465405b..1b54e90 100644
--- a/php-doctrine-migrations.spec
+++ b/php-doctrine-migrations.spec
@@ -8,7 +8,7 @@
#
%global bootstrap 0
-%global gh_commit 6d87c9a0baa6a4725b4c4e1a45b2a39f53bf1859
+%global gh_commit 28d92a34348fee5daeb80879e56461b2e862fc05
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner doctrine
%global gh_project migrations
@@ -25,7 +25,7 @@
%endif
Name: php-%{pk_vendor}-%{pk_project}
-Version: 2.3.4
+Version: 2.3.5
Release: 1%{?dist}
Summary: PHP Doctrine Migrations project
@@ -68,18 +68,21 @@ BuildRequires: (php-composer(friendsofphp/proxy-manager-lts) >= 1.0 with php-c
# "phpstan/phpstan-phpunit": "^0.12",
# "phpstan/phpstan-strict-rules": "^0.12",
# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+# "symfony/cache": "^4.4. || ^5.3",
# "symfony/process": "^3.4||^4.0||^5.0",
# "symfony/yaml": "^3.4||^4.0||^5.0"
BuildRequires: php-pdo_sqlite
BuildRequires: (php-composer(doctrine/orm) >= 2.6 with php-composer(doctrine/orm) < 3)
+BuildRequires: (php-composer(symfony/cache) >= 4.0 with php-composer(symfony/cache) < 6)
BuildRequires: (php-composer(symfony/process) >= 4.0 with php-composer(symfony/process) < 6)
BuildRequires: (php-composer(symfony/yaml) >= 4.0 with php-composer(symfony/yaml) < 6)
BuildRequires: (php-composer(jdorn/sql-formatter) >= 1.1 with php-composer(jdorn/sql-formatter) < 2)
BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6 with php-composer(mikey179/vfsstream) < 2)
-# remirepo:15
+# remirepo:16
%else
BuildRequires: php-composer(doctrine/dbal) < 3
BuildRequires: php-composer(doctrine/dbal) >= 2.9
+BuildRequires: php-symfony4-cache >= 4.0
BuildRequires: php-symfony4-console >= 4.0
BuildRequires: php-symfony4-stopwatch >= 4.0
BuildRequires: php-composer(friendsofphp/proxy-manager-lts) < 2
@@ -218,6 +221,10 @@ mkdir vendor
cat << 'EOF' | tee -a vendor/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php',
+ [
+ '%{_datadir}/php/Symfony5/Component/Cache/autoload.php',
+ '%{_datadir}/php/Symfony4/Component/Cache/autoload.php',
+ ],
'%{_datadir}/php/%{ns_vendor}/ORM/autoload.php',
'%{_datadir}/php/org/bovigo/vfs/autoload.php',
]);
@@ -226,14 +233,16 @@ EOF
# need investigation (migrations directory deleted during test suite?)
chmod -w tests/Doctrine/Migrations/Tests/Functional/_files
-# testMigrationLifecycleFromCommandLine fails with some symfony versions (4.2) ok with newer (4.3)
+# PHP 8.1 testAddSqlInPostUp: Failed asserting that 3 is identical to '3'
+
: Run test suite
ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php74 php80 php81; do
TMP=$(mktemp -d)
if which $cmd; then
TMPDIR=$TMP $cmd %{_bindir}/phpunit9 \
--bootstrap vendor/autoload.php \
+ --filter '^((?!(testAddSqlInPostUp)).)*$' \
--verbose || ret=1
rm -rf $TMP
fi
@@ -258,6 +267,11 @@ exit $ret
%changelog
+* Thu Jan 27 2022 Remi Collet <remi@remirepo.net> - 2.3.5-1
+- update to 2.3.5
+- add build dependency on symfony/cache
+- ignore 1 failed test with 8.1, FTBFS #2046815
+
* Mon Jul 5 2021 Remi Collet <remi@remirepo.net> - 2.3.4-1
- update to 2.3.4
- switch to symfony 4