From 13761a01dc4aeccde3cab1284805f77fe22de539 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 19 Aug 2017 07:48:03 +0200
Subject: sync with fedora

---
 php-symfony3.spec | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'php-symfony3.spec')

diff --git a/php-symfony3.spec b/php-symfony3.spec
index f0155b2..8f62142 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -120,7 +120,7 @@
 
 Name:          php-%{composer_project}3
 Version:       %{github_version}
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Symfony PHP framework (version 3)
 
 Group:         Development/Libraries
@@ -2038,13 +2038,6 @@ if (in_array(basename('$PKG'), [
     require_once '%{phpdir}/Psr/Log/autoload.php';
 }
 
-// Missing in require-dev (use Error class from PHP 7)
-if (in_array(basename('$PKG'), [
-    'Console',
-])) {
-    require_once '%{phpdir}/Symfony/Polyfill/autoload.php';
-}
-
 // For cache component's require-dev.
 if ('Cache' == basename('$PKG')) {
     require_once '%{phpdir}/Cache/IntegrationTests/autoload.php';
@@ -2052,18 +2045,20 @@ if ('Cache' == basename('$PKG')) {
     require_once '%{phpdir}/Doctrine/DBAL/autoload.php';
 }
 
-// For workflow component's require-dev.
-if ('Workflow' == basename('$PKG')) {
-    require_once '%{phpdir}/Psr/Cache/autoload.php';
+// For console component's (undocumented) require-dev.
+// See https://github.com/symfony/symfony/pull/23934
+if ('Console' == basename('$PKG')) {
+    require_once '%{phpdir}/Symfony/Polyfill/autoload.php';
 }
 
-// Missing
+// For vardumper component's require-dev.
 if ('VarDumper' == basename('$PKG')) {
-    if  (file_exists('%{phpdir}/Twig/autoload.php')) {
-        require_once '%{phpdir}/Twig/autoload.php';
-    } else {
-        require_once '%{phpdir}/Twig2/autoload.php';
-    }
+    require_once file_exists('%{phpdir}/Twig2/autoload.php') ? '%{phpdir}/Twig2/autoload.php' : '%{phpdir}/Twig/autoload.php';
+}
+
+// For workflow component's require-dev.
+if ('Workflow' == basename('$PKG')) {
+    require_once '%{phpdir}/Psr/Cache/autoload.php';
 }
 BOOTSTRAP
 
@@ -2820,6 +2815,9 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Fri Aug 18 2017 Shawn Iwinski <shawn@iwin.ski> - 3.3.6-3
+- Fix some tests' dev requires (thanks Remi!)
+
 * Mon Aug 14 2017 Shawn Iwinski <shawn@iwin.ski> - 3.3.6-2
 - Fix dotenv sub-package Composer provide
 
-- 
cgit