Merge branch '2.3' into 2.7
* 2.3: [HttpKernel] Fix time-sensitive test case [travis] Fail early when an invalid composer.json is found
This commit is contained in:
commit
5d8ce715f1
@ -19,8 +19,11 @@ foreach ($dirs as $dir) {
|
|||||||
}
|
}
|
||||||
echo "$dir\n";
|
echo "$dir\n";
|
||||||
|
|
||||||
$json = file_get_contents($dir.'/composer.json');
|
$json = ltrim(file_get_contents($dir.'/composer.json'));
|
||||||
$package = json_decode($json);
|
if (null === $package = json_decode($json)) {
|
||||||
|
passthru("composer validate $dir/composer.json");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
$package->repositories = array(array(
|
$package->repositories = array(array(
|
||||||
'type' => 'composer',
|
'type' => 'composer',
|
||||||
|
@ -15,6 +15,9 @@ use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
|
|||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group time-sensitive
|
||||||
|
*/
|
||||||
class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
|
class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
private $requestStack;
|
private $requestStack;
|
||||||
|
Reference in New Issue
Block a user