diff --git a/.travis.php b/.travis.php index 1334f14ad4..511e05008a 100644 --- a/.travis.php +++ b/.travis.php @@ -19,8 +19,11 @@ foreach ($dirs as $dir) { } echo "$dir\n"; - $json = file_get_contents($dir.'/composer.json'); - $package = json_decode($json); + $json = ltrim(file_get_contents($dir.'/composer.json')); + if (null === $package = json_decode($json)) { + passthru("composer validate $dir/composer.json"); + exit(1); + } $package->repositories = array(array( 'type' => 'composer', diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php index eda88ceb61..79fee3fcb6 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php @@ -15,6 +15,9 @@ use Symfony\Component\HttpKernel\Fragment\FragmentHandler; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +/** + * @group time-sensitive + */ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase { private $requestStack; diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index e89fb8d00c..3362971d17 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -27,8 +27,7 @@ "symfony/expression-language": "~2.6|~3.0.0", "symfony/http-foundation": "~2.4|~3.0.0", "symfony/ldap": "~2.8|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", - "symfony/validator": "~2.5,>=2.5.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.9|~3.0.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index d89c4a98c2..8764ce6d56 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -37,8 +37,7 @@ "symfony/finder": "~2.3|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.2|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", - "symfony/validator": "~2.5,>=2.5.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.9|~3.0.0", "psr/log": "~1.0", "symfony/expression-language": "~2.6|~3.0.0", "symfony/ldap": "~2.8|~3.0.0"