[php-symfony] - update to 2.5.5 - hack PHPUnit autoloader to not use old system symfony - don't skip any Yaml test

[Remi Collet]

commit cf4e65ee0f11b4cc84de7dd49d57095f3d9faf25
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Sep 29 16:04:45 2014 +0200

    - update to 2.5.5
    - hack PHPUnit autoloader to not use old system symfony
    - don't skip any Yaml test

 php-symfony.spec |   31 ++++++++++++++++++-------------
 sources          |    1 -
 2 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/php-symfony.spec b/php-symfony.spec
index b4ca899..d640865 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   2.5.4
-%global github_commit    3a369dddea56596df91977d8c2083e70784852f2
+%global github_version   2.5.5
+%global github_commit    2aef97bbc95d0c4ae63537cca81bd6d984427d81
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -1013,8 +1013,10 @@ Optional:
 * Memcached (php-pecl-memcached)
 * Mongo (php-pecl-mongo)
 * Redis (php-pecl-redis)
-%if 0%{?el6}%{?el7}
+%if 0%{?rhel} >= 6
 * Zend OPcache (php-pecl-zendopcache)
+%else
+* Zend OPcache (php-opcache)
 %endif
 
 # ------------------------------------------------------------------------------
@@ -1496,6 +1498,14 @@ if (file_exists('%{_datadir}/php/password_compat/password.php')) {
 return $loader;
 AUTOLOADER
 
+# Hack PHPUnit Autoloader (use current symfony instead of system one)
+if [ -d /usr/share/php/PHPUnit ]; then
+  mkdir PHPUnit
+  sed -e '/Symfony/s:\$vendorDir:"./src/":' \
+      -e 's:path = dirname(__FILE__):path = "/usr/share/php/PHPUnit":' \
+      /usr/share/php/PHPUnit/Autoload.php >PHPUnit/Autoload.php
+fi
+
 # Create PHPUnit config w/ colors turned off
 sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
@@ -1528,16 +1538,6 @@ sed -e 's/function testConstructorHandlesFormAttribute/function SKIP_testConstru
     -i src/Symfony/Component/DomCrawler/Tests/FormTest.php
 rm -f src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
 %endif
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 21
-sed -e 's/function testParseReferences/function SKIP_testParseReferences/' \
-    -e 's/function testParseMapReferenceInSequence/function SKIP_testParseMapReferenceInSequence/' \
-    -i src/Symfony/Component/Yaml/Tests/InlineTest.php
-sed -e 's/function testSpecifications/function SKIP_testSpecifications/' \
-    -e 's/function testReferenceResolvingInInlineStrings/function SKIP_testReferenceResolvingInInlineStrings/' \
-    -i src/Symfony/Component/Yaml/Tests/ParserTest.php
-sed 's/function testSpecifications/function SKIP_testSpecifications/' \
-    -i src/Symfony/Component/Yaml/Tests/DumperTest.php
-%endif
 
 # Run tests
 RET=0
@@ -2152,6 +2152,11 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon Sep 29 2014 Remi Collet <remi at fedoraproject.org> - 2.5.5-1
+- update to 2.5.5
+- hack PHPUnit autoloader to not use old system symfony
+- don't skip any Yaml test
+
 * Wed Sep 03 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.4-1
 - Updated to 2.5.4 (CVE-2014-6072, CVE-2014-5245, CVE-2014-4931, CVE-2014-6061,
   CVE-2014-5244, BZ #1138285)
diff --git a/sources b/sources
index 365c8e2..5ec95b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 81f55eb5f09a4383943aa95e00e8e381  php-symfony-2.5.4-3a369dddea56596df91977d8c2083e70784852f2.tar.gz
-0833352e53346cd98a479b3b2d693333  autoloader-2.5.0BETA2.tgz