php-symfony: 2.5.4 (backport)

1 files changed, 63 insertions, 57 deletions

diff --git a/php-symfony.spec b/php-symfony.spec
index 003ed56..b229893 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -10,10 +10,11 @@
 # Please preserve changelog entries
 #
 
+%{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   2.5.3
-%global github_commit    f077a238c781f845487a7c81fea8033ccd0e6a02
+%global github_version   2.5.4
+%global github_commit    3a369dddea56596df91977d8c2083e70784852f2
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -227,7 +228,7 @@ Requires: php-composer(doctrine/dbal)                >= %{doctrine_dbal_min_ver}
 Requires: php-composer(doctrine/dbal)                <  %{doctrine_dbal_max_ver}
 Requires: php-composer(doctrine/orm)                 >= %{doctrine_orm_min_ver}
 Requires: php-composer(doctrine/orm)                 <  %{doctrine_orm_max_ver}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-date
 Requires: php-hash
 Requires: php-json
@@ -266,7 +267,7 @@ Requires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 Requires: php-composer(%{composer_vendor}/console)          = %{version}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel)      = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-pcre
 
 # Composer
@@ -331,7 +332,7 @@ Group:    Development/Libraries
 Requires: php-swift-Swift >= %{swift_min_ver}
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 # <none>
 
 # Composer
@@ -371,7 +372,7 @@ Requires: php-composer(%{composer_vendor}/stopwatch)           = %{version}
 Requires: php-composer(%{composer_vendor}/templating)          = %{version}
 Requires: php-composer(%{composer_vendor}/translation)         = %{version}
 Requires: php-composer(%{composer_vendor}/yaml)                = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-json
 Requires: php-pcre
 Requires: php-spl
@@ -415,8 +416,9 @@ Requires: php-composer(%{composer_vendor}/console)              =  %{version}
 Requires: php-composer(%{composer_vendor}/finder)               =  %{version}
 Requires: php-composer(%{composer_vendor}/form)                 =  %{version}
 Requires: php-composer(%{composer_vendor}/validator)            =  %{version}
+Requires: php-composer(%{composer_vendor}/yaml)                 =  %{version}
 Requires: php-composer(doctrine/cache)
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-dom
 Requires: php-fileinfo
 Requires: php-filter
@@ -453,7 +455,7 @@ Group:    Development/Libraries
 # composer.json
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/security)    = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-pcre
 Requires: php-spl
 
@@ -474,9 +476,10 @@ Summary:  Symfony Twig Bundle
 Group:    Development/Libraries
 
 # composer.json
-Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
-Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
+Requires: php-composer(%{composer_vendor}/http-kernel)     = %{version}
+Requires: php-composer(%{composer_vendor}/twig-bridge)     = %{version}
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-ctype
 Requires: php-json
 Requires: php-pcre
@@ -506,7 +509,7 @@ Group:    Development/Libraries
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/routing)     = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-pcre
 Requires: php-spl
 
@@ -533,7 +536,7 @@ Group:     Development/Libraries
 Requires:  php-composer(%{composer_vendor}/dom-crawler) = %{version}
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/process)     = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -563,7 +566,7 @@ URL:       http://symfony.com/doc/current/components/class_loader/index.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-hash
 Requires:  php-pcre
 Requires:  php-reflection
@@ -613,7 +616,7 @@ Group:     Development/Libraries
 
 # composer.json
 Requires:  php-composer(%{composer_vendor}/filesystem) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-dom
 Requires:  php-json
@@ -646,7 +649,7 @@ Group:     Development/Libraries
 Requires:  php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires:  php-composer(psr/log) >= %{psrlog_min_ver}
 Requires:  php-composer(psr/log) <  %{psrlog_max_ver}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-dom
 Requires:  php-json
@@ -683,7 +686,7 @@ URL:       http://symfony.com/doc/current/components/css_selector.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-pcre
 
 # Composer
@@ -710,7 +713,7 @@ Group:    Development/Libraries
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel)     = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-pcre
 Requires: php-reflection
 Requires: php-spl
@@ -741,7 +744,7 @@ Group:     Development/Libraries
 Requires:  php-composer(%{composer_vendor}/config) = %{version}
 #Requires:  php-composer(%%{composer_vendor}/proxy-manager-bridge) = %%{version}
 Requires:  php-composer(%{composer_vendor}/yaml)   = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-dom
 Requires:  php-hash
 Requires:  php-pcre
@@ -773,7 +776,7 @@ Group:     Development/Libraries
 
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/css-selector) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-dom
 Requires:  php-libxml
 Requires:  php-mbstring
@@ -804,7 +807,7 @@ Group:     Development/Libraries
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:  php-composer(%{composer_vendor}/http-kernel)          = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
@@ -835,7 +838,7 @@ URL:       http://symfony.com/doc/current/components/expression_language/index.h
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-pcre
 Requires:  php-spl
@@ -862,7 +865,7 @@ URL:       http://symfony.com/doc/current/components/filesystem.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-spl
 
@@ -886,7 +889,7 @@ URL:       http://symfony.com/doc/current/components/finder.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -920,7 +923,7 @@ Requires:  php-composer(%{composer_vendor}/framework-bundle) = %{version}
 Requires:  php-composer(%{composer_vendor}/security-csrf)    = %{version}
 Requires:  php-composer(%{composer_vendor}/twig-bridge)      = %{version}
 Requires:  php-composer(%{composer_vendor}/validator)        = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
@@ -952,7 +955,7 @@ URL:       http://symfony.com/doc/current/components/http_foundation/index.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-fileinfo
 Requires:  php-filter
@@ -1011,7 +1014,7 @@ Requires:  php-composer(%{composer_vendor}/config)               = %{version}
 Requires:  php-composer(%{composer_vendor}/console)              = %{version}
 Requires:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:  php-composer(%{composer_vendor}/finder)               = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-hash
 Requires:  php-json
@@ -1063,7 +1066,7 @@ Requires:  php-composer(%{composer_vendor}/icu) >= %{symfony_icu_min_ver}
 Requires:  php-composer(%{composer_vendor}/icu) <  %{symfony_icu_max_ver}
 # composer.json: optional
 Requires:  php-intl
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1094,7 +1097,7 @@ Group:     Development/Libraries
 
 # composer.json
 Requires:  php-composer(%{composer_vendor}/intl) = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-intl
 
 # Composer
@@ -1121,7 +1124,7 @@ URL:       http://symfony.com/doc/current/components/options_resolver.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-reflection
 Requires:  php-spl
 
@@ -1148,7 +1151,7 @@ URL:       http://symfony.com/doc/current/components/process.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-pcntl
 Requires:  php-pcre
 Requires:  php-spl
@@ -1173,7 +1176,7 @@ URL:       http://symfony.com/doc/current/components/property_access/introductio
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1207,7 +1210,7 @@ Requires:  php-composer(%{composer_vendor}/expression-language) =  %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)                =  %{version}
 Requires:  php-composer(doctrine/annotations)                   >= %{doctrine_annotations_min_ver}
 Requires:  php-composer(doctrine/annotations)                   <  %{doctrine_annotations_max_ver}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-dom
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1249,7 +1252,7 @@ Requires:  php-composer(doctrine/dbal) <  %{doctrine_dbal_max_ver}
 Requires:  php-password-compat >= %{password_compat_min_ver}
 Requires:  php-password-compat <  %{password_compat_max_ver}
 %endif
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
@@ -1294,7 +1297,7 @@ URL:       http://symfony.com/doc/current/components/serializer.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-dom
 Requires:  php-json
@@ -1324,7 +1327,7 @@ URL:      http://symfony.com/doc/current/components/stopwatch.html
 Group:    Development/Libraries
 
 Requires: %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires: php-spl
 
 # Composer
@@ -1350,7 +1353,7 @@ Requires:  %{name}-common        =  %{version}-%{release}
 # composer.json: optional
 Requires:  php-composer(psr/log) >= %{psrlog_min_ver}
 Requires:  php-composer(psr/log) <  %{psrlog_max_ver}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-hash
 Requires:  php-iconv
@@ -1384,7 +1387,7 @@ Group:     Development/Libraries
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/config) = %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)   = %{version}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-dom
 Requires:  php-iconv
 Requires:  php-intl
@@ -1428,7 +1431,7 @@ Requires:  php-composer(doctrine/annotations) <  %{doctrine_annotations_max_ver}
 Requires:  php-composer(doctrine/cache)       >= %{doctrine_cache_min_ver}
 Requires:  php-composer(doctrine/cache)       <  %{doctrine_cache_max_ver}
 ## TODO: "egulias/email-validator"
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-filter
@@ -1464,7 +1467,7 @@ URL:       http://symfony.com/doc/current/components/yaml/index.html
 Group:     Development/Libraries
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.2)
+# phpcompatinfo (computed from version 2.5.4)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-json
@@ -1560,10 +1563,6 @@ sed 's/function testCheckTimeoutOnStartedProcess/function SKIP_testCheckTimeoutO
     -i src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
 
 # Temporarily skip tests that are known to fail
-rm -rf src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php \
-       src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php \
-       src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php \
-       src/Symfony/Component/HttpKernel/Tests/KernelTest.php
 sed 's/function testClassNotFound/ function SKIP_testClassNotFound/' \
     -i src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
 sed 's/function testTTYCommand/function SKIP_testTTYCommand/' \
@@ -1572,23 +1571,24 @@ sed 's/function testTTYCommandExitCode/function SKIP_testTTYCommandExitCode/' \
     -i src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
 sed 's/function testStrict/function SKIP_testStrict/' \
     -i src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
-%if 0%{?fedora} > 20
-sed 's/function testTrimUtf8/function SKIP_testTrimUtf8/' \
-    -i src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
-%endif
 %if 0%{?rhel}
 sed 's/function testForm/function SKIP_testForm/' \
     -i src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
 sed -e 's/function testConstructorHandlesFormAttribute/function SKIP_testConstructorHandlesFormAttribute/' \
     -e 's/function testConstructorHandlesFormValues/function SKIP_testConstructorHandlesFormValues/' \
     -i src/Symfony/Component/DomCrawler/Tests/FormTest.php
-sed 's/function testSetContent/function SKIP_testSetContent/' \
-    -i src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
 rm -f src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
 %endif
-%if 0%{?el7}
-sed 's/function testValidatesCachedResponsesWithLastModifiedAndNoFreshnessInformation/function SKIP_testValidatesCachedResponsesWithLastModifiedAndNoFreshnessInformation/' \
-    -i src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+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
+%if 0%{?rhel} == 5
+rm src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
 %endif
 
 # Run tests
@@ -2078,8 +2078,8 @@ exit $RET
 %exclude %{symfony_dir}/Component/PropertyAccess/LICENSE
 %exclude %{symfony_dir}/Component/PropertyAccess/*.md
 %exclude %{symfony_dir}/Component/PropertyAccess/composer.json
-#%%exclude %%{symfony_dir}/Component/PropertyAccess/phpunit.*
-#%%exclude %%{symfony_dir}/Component/PropertyAccess/Tests
+%exclude %{symfony_dir}/Component/PropertyAccess/phpunit.*
+%exclude %{symfony_dir}/Component/PropertyAccess/Tests
 
 # ------------------------------------------------------------------------------
 
@@ -2138,8 +2138,8 @@ exit $RET
 %exclude %{symfony_dir}/Component/Stopwatch/LICENSE
 %exclude %{symfony_dir}/Component/Stopwatch/*.md
 %exclude %{symfony_dir}/Component/Stopwatch/composer.json
-#%%exclude %%{symfony_dir}/Component/Stopwatch/phpunit.*
-#%%exclude %%{symfony_dir}/Component/Stopwatch/Tests
+%exclude %{symfony_dir}/Component/Stopwatch/phpunit.*
+%exclude %{symfony_dir}/Component/Stopwatch/Tests
 
 # ------------------------------------------------------------------------------
 
@@ -2204,6 +2204,12 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Wed Sep 03 2014 Shawn Iwinski <shawn.iwinski@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)
+- Removed test files from PropertyAccess and Stopwatch components
+- Updated skipped tests
+
 * Tue Aug 12 2014 Remi Collet <remi@fedoraproject.org> - 2.5.3-1
 - update to 2.5.3
 - fix test bootstrap for PHPUnit 4.2