From a027b868213dc921141ae2d3cc56d1f6977ecc34 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 5 Nov 2019 10:11:22 +0100
Subject: v3.4.33

---
 composer.json                                 |  3 +--
 php-symfony3.spec                             | 20 +++++++++-----------
 src/Symfony/Bridge/ProxyManager/composer.json |  1 -
 src/Symfony/Component/Dotenv/composer.json    |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 5799e0d..42397d7 100644
--- a/composer.json
+++ b/composer.json
@@ -123,8 +123,7 @@
             "Symfony\\Component\\": "src/Symfony/Component/"
         },
         "classmap": [
-            "src/Symfony/Component/Intl/Resources/stubs",
-            "src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php"
+            "src/Symfony/Component/Intl/Resources/stubs"
         ],
         "exclude-from-classmap": [
             "**/Tests/"
diff --git a/php-symfony3.spec b/php-symfony3.spec
index 100b42a..5332a8f 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   3.4.31
-%global github_commit    944e04808117477f46f804133d17913b77cf63d3
+%global github_version   3.4.33
+%global github_commit    47813652695f1345987fd5dfc0df67607e738b31
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -112,7 +112,7 @@
 
 Name:          php-%{composer_project}3
 Version:       %{github_version}
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       Symfony PHP framework (version 3)
 
 # MIT and CC-BY-SA:
@@ -156,7 +156,7 @@ BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver}
 BuildRequires: php-composer(phpdocumentor/reflection-docblock) <  %{phpdocumentor_reflection_docblock_max_ver}
 BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
 BuildConflicts: php-composer(phpdocumentor/reflection-docblock) = 3.2.0
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit7
 BuildRequires: php-composer(psr/cache) <  %{psr_cache_max_ver}
 BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
 BuildRequires: php-composer(psr/container) <  %{psr_container_max_ver}
@@ -210,10 +210,7 @@ BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
 Requires:      php-composer(%{composer_vendor}/monolog-bridge) = %{version}
 #Requires:      php-composer(%%{composer_vendor}/phpunit-bridge) = %%{version}
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
-# this requires ZF and thus PHP 7
 Requires:      php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version}
-%endif
 Requires:      php-composer(%{composer_vendor}/twig-bridge) = %{version}
 # Bundles
 Requires:      php-composer(%{composer_vendor}/debug-bundle) = %{version}
@@ -1984,12 +1981,12 @@ for PKG in %{buildroot}%{symfony3_dir}/*/*; do
         cat << BOOTSTRAP | tee bootstrap.php
 <?php
 require_once '${PKG}/autoload-dev.php';
-require_once '%{buildroot}%{symfony3_dir}/Bridge/PhpUnit/bootstrap.php';
+require_once '%{buildroot}%{symfony3_dir}/Bridge/PhpUnit/autoload.php';
 require_once '%{buildroot}%{symfony3_dir}/vendor/autoload.php';
 BOOTSTRAP
 
         %{_bindir}/php -d include_path=.:${PSR0}:%{buildroot}%{phpdir}:%{phpdir} \
-            %{_bindir}/phpunit --exclude-group benchmark $PKG || RET=1
+            %{_bindir}/phpunit7 --exclude-group benchmark $PKG || RET=1
     fi
 done
 exit $RET
@@ -2807,11 +2804,12 @@ exit $RET
 # ##############################################################################
 
 %changelog
-* Tue Aug 27 2019 Remi Collet <remi@remirepo.net> - 3.4.31-1
-- update to 3.4.31
+* Tue Nov  5 2019 Remi Collet <remi@remirepo.net> - 3.4.33-1
+- update to 3.4.33
 - raise dependency on twig 1.41
 - raise dependency on egulias/email-validator 2.1.10
 - raise dependency on doctrine/annotations 1.7
+- switch to phpunit7
 
 * Sat Sep 14 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.30-2
 - Update autoloader generator to include self PSR-0, PSR-4, files, and classmap
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 4adc5c0..7e34cd9 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -25,7 +25,6 @@
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
-        "classmap": [ "Legacy/ProxiedMethodReturnExpression.php" ],
         "exclude-from-classmap": [
             "/Tests/"
         ]
diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json
index 3bcfd89..e35339c 100644
--- a/src/Symfony/Component/Dotenv/composer.json
+++ b/src/Symfony/Component/Dotenv/composer.json
@@ -19,7 +19,7 @@
         "php": "^5.5.9|>=7.0.8"
     },
     "require-dev": {
-        "symfony/process": "~3.2|~4.0"
+        "symfony/process": "^3.4.2|^4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Dotenv\\": "" },
-- 
cgit