Merge branch '2.7' into 2.8

* 2.7:
  [Security][2.7] Clean deps
  [HttpKernel] Fix time-sensitive test case
  [travis] Fail early when an invalid composer.json is found

Conflicts:
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/composer.json
This commit is contained in:
Nicolas Grekas 2015-11-03 15:28:10 +01:00
commit 5805cc5040
4 changed files with 10 additions and 6 deletions

View File

@ -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',

View File

@ -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;

View File

@ -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": {

View File

@ -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"