update to 2.3.3

1 files changed, 51 insertions, 44 deletions

diff --git a/php-doctrine-migrations.spec b/php-doctrine-migrations.spec
index ce2727f..3f911ed 100644
--- a/php-doctrine-migrations.spec
+++ b/php-doctrine-migrations.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    100e85a8509b521f010901890f042e9401a3043b
+%global gh_commit    c4c46f7064f6e7795bd7f26549579918b46790fa
 %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.0
+Version:        2.3.3
 Release:        1%{?dist}
 Summary:        PHP Doctrine Migrations project
 
@@ -52,22 +52,22 @@ BuildRequires:  php-phar
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/dbal)          >= 2.9   with php-composer(doctrine/dbal)          < 3)
-BuildRequires: (php-composer(symfony/console)        >= 3.4   with php-composer(symfony/console)        < 6)
-BuildRequires: (php-composer(symfony/stopwatch)      >= 3.4   with php-composer(symfony/stopwatch)      < 6)
-BuildRequires: (php-composer(ocramius/proxy-manager) >= 2.0.2 with php-composer(ocramius/proxy-manager) < 3)
+BuildRequires: (php-composer(doctrine/dbal)                  >= 2.9   with php-composer(doctrine/dbal)                  < 3)
+BuildRequires: (php-composer(symfony/console)                >= 3.4   with php-composer(symfony/console)                < 6)
+BuildRequires: (php-composer(symfony/stopwatch)              >= 3.4   with php-composer(symfony/stopwatch)              < 6)
+BuildRequires: (php-composer(friendsofphp/proxy-manager-lts) >= 1.0   with php-composer(friendsofphp/proxy-manager-lts) < 2)
 # From composer.json
 #    "require-dev": {
 #        "ext-pdo_sqlite": "*",
-#        "doctrine/coding-standard": "^6.0",
+#        "doctrine/coding-standard": "^8.2",
 #        "doctrine/orm": "^2.6",
 #        "jdorn/sql-formatter": "^1.1",
 #        "mikey179/vfsstream": "^1.6",
-#        "phpstan/phpstan": "^0.10",
-#        "phpstan/phpstan-deprecation-rules": "^0.10",
-#        "phpstan/phpstan-phpunit": "^0.10",
-#        "phpstan/phpstan-strict-rules": "^0.10",
-#        "phpunit/phpunit": "^7.0",
+#        "phpstan/phpstan": "^0.12",
+#        "phpstan/phpstan-deprecation-rules": "^0.12",
+#        "phpstan/phpstan-phpunit": "^0.12",
+#        "phpstan/phpstan-strict-rules": "^0.12",
+#        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
 #        "symfony/process": "^3.4||^4.0||^5.0",
 #        "symfony/yaml": "^3.4||^4.0||^5.0"
 BuildRequires:  php-pdo_sqlite
@@ -78,30 +78,30 @@ BuildRequires: (php-composer(jdorn/sql-formatter)    >= 1.1   with php-composer(
 BuildRequires: (php-composer(mikey179/vfsstream)     >= 1.6   with php-composer(mikey179/vfsstream)     < 2)
 # remirepo:15
 %else
-BuildRequires:  php-composer(doctrine/dbal)          <  3
-BuildRequires:  php-composer(doctrine/dbal)          >= 2.9
-BuildRequires:  php-symfony3-console                 >= 3.4
-BuildRequires:  php-symfony3-stopwatch               >= 3.4
-BuildRequires:  php-composer(ocramius/proxy-manager) <  3
-BuildRequires:  php-composer(ocramius/proxy-manager) >= 2.0.2
-BuildRequires:  php-composer(doctrine/orm)           <  3
-BuildRequires:  php-composer(doctrine/orm)           >= 2.5
-BuildRequires:  php-symfony3-yaml                    >= 3.3
-BuildRequires:  php-composer(jdorn/sql-formatter)    <  2
-BuildRequires:  php-composer(jdorn/sql-formatter)    >= 1.1
-BuildRequires:  php-composer(mikey179/vfsstream)     <  2
-BuildRequires:  php-composer(mikey179/vfsStream)     >= 1.6
+BuildRequires:  php-composer(doctrine/dbal)                  <  3
+BuildRequires:  php-composer(doctrine/dbal)                  >= 2.9
+BuildRequires:  php-symfony3-console                         >= 3.4
+BuildRequires:  php-symfony3-stopwatch                       >= 3.4
+BuildRequires:  php-composer(friendsofphp/proxy-manager-lts) <  2
+BuildRequires:  php-composer(friendsofphp/proxy-manager-lts) >= 1.0
+BuildRequires:  php-composer(doctrine/orm)                   <  3
+BuildRequires:  php-composer(doctrine/orm)                   >= 2.5
+BuildRequires:  php-symfony3-yaml                            >= 3.3
+BuildRequires:  php-composer(jdorn/sql-formatter)            <  2
+BuildRequires:  php-composer(jdorn/sql-formatter)            >= 1.1
+BuildRequires:  php-composer(mikey179/vfsstream)             <  2
+BuildRequires:  php-composer(mikey179/vfsStream)             >= 1.6
 %endif
-BuildRequires:  phpunit7
+BuildRequires:  phpunit9
 %endif
 
 # From composer.json
 #    "require": {
-#        "php": "^7.1",
+#        "php": "^7.1 || ^8.0",
 #        "composer/package-versions-deprecated": "^1.8",
 #        "doctrine/dbal": "^2.9",
-#        "ocramius/proxy-manager": "^2.0.2",
-#        "symfony/console": "^3.4||^4.0||^5.0",
+#        "friendsofphp/proxy-manager-lts": "^1.0",
+#        "symfony/console": "^3.4||^4.4.16||^5.0",
 #        "symfony/stopwatch": "^3.4||^4.0||^5.0"
 #    "suggest": {
 #        "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.",
@@ -110,20 +110,20 @@ BuildRequires:  phpunit7
 Requires:       php(language) >= 7.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(doctrine/dbal)          >= 2.9   with php-composer(doctrine/dbal)          < 3)
-Requires:      (php-composer(symfony/console)        >= 3.4   with php-composer(symfony/console)        < 6)
-Requires:      (php-composer(symfony/stopwatch)      >= 3.4   with php-composer(symfony/stopwatch)      < 6)
-Requires:      (php-composer(ocramius/proxy-manager) >= 2.0.2 with php-composer(ocramius/proxy-manager) < 3)
-Recommends:    (php-composer(mikey179/vfsStream)     >= 1.6   with php-composer(mikey179/vfsStream)     < 2)
-Recommends:    (php-composer(symfony/yaml)           >= 3.3   with php-composer(symfony/yaml)           < 6)
+Requires:      (php-composer(doctrine/dbal)                  >= 2.9   with php-composer(doctrine/dbal)                  < 3)
+Requires:      (php-composer(symfony/console)                >= 3.4   with php-composer(symfony/console)                < 6)
+Requires:      (php-composer(symfony/stopwatch)              >= 3.4   with php-composer(symfony/stopwatch)              < 6)
+Requires:      (php-composer(friendsofphp/proxy-manager-lts) >= 1.0   with php-composer(friendsofphp/proxy-manager-lts) < 2)
+Recommends:    (php-composer(mikey179/vfsStream)             >= 1.6   with php-composer(mikey179/vfsStream)             < 2)
+Recommends:    (php-composer(symfony/yaml)                   >= 3.3   with php-composer(symfony/yaml)                   < 6)
 # remirepo:8
 %else
-Requires:       php-composer(doctrine/dbal)          <  3
-Requires:       php-composer(doctrine/dbal)          >= 2.9
-Requires:       php-symfony3-console                 >= 3.4
-Requires:       php-symfony3-stopwatch               >= 3.4
-Requires:       php-composer(ocramius/proxy-manager) <  3
-Requires:       php-composer(ocramius/proxy-manager) >= 2.0.2
+Requires:       php-composer(doctrine/dbal)                  <  3
+Requires:       php-composer(doctrine/dbal)                  >= 2.9
+Requires:       php-symfony3-console                         >= 3.4
+Requires:       php-symfony3-stopwatch                       >= 3.4
+Requires:       php-composer(friendsofphp/proxy-manager-lts) <  2
+Requires:       php-composer(friendsofphp/proxy-manager-lts) >= 1.0
 %endif
 # From phpcompatinfo report for version 1.8.1
 Requires:       php-simplexml
@@ -183,7 +183,7 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php
         '%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php',
         '%{_datadir}/php/Symfony3/Component/Stopwatch/autoload.php',
     ],
-    '%{_datadir}/php/ProxyManager/autoload.php',
+    '%{_datadir}/php/FriendsOfPHP/ProxyManager/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
     '%{_datadir}/php/jdorn-sql-formatter/autoload.php',
@@ -229,10 +229,10 @@ chmod -w tests/Doctrine/Migrations/Tests/Functional/_files
 # testMigrationLifecycleFromCommandLine fails with some symfony versions (4.2) ok with newer (4.3)
 : Run test suite
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   TMP=$(mktemp -d)
   if which $cmd; then
-    TMPDIR=$TMP $cmd %{_bindir}/phpunit7 \
+    TMPDIR=$TMP $cmd %{_bindir}/phpunit9 \
         --bootstrap vendor/autoload.php \
         --verbose || ret=1
     rm -rf $TMP
@@ -258,6 +258,13 @@ exit $ret
 
 
 %changelog
+* Mon Mar 15 2021 Remi Collet <remi@remirepo.net> - 2.3.3-1
+- update to 2.3.3
+
+* Tue Jan  5 2021 Remi Collet <remi@remirepo.net> - 2.3.2-1
+- update to 2.3.2
+- use friendsofphp/proxy-manager-lts instead of ocramius/proxy-manager
+
 * Thu Nov  5 2020 Remi Collet <remi@remirepo.net> - 2.3.0-1
 - update to 2.3.0