diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  [HttpKernel] Fix time-sensitive test case
  [travis] Fail early when an invalid composer.json is found
This commit is contained in:
Nicolas Grekas 2015-11-03 15:24:30 +01:00
commit 5d8ce715f1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.php
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',

3
src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
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;