Skip to content

Commit 3f0bb90

Browse files
Merge branch '2.8'
* 2.8: [Security] Clean deps [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
2 parents 0f6e478 + 5805cc5 commit 3f0bb90

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.travis.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
}
2020
echo "$dir\n";
2121

22-
$json = file_get_contents($dir.'/composer.json');
23-
$package = json_decode($json);
22+
$json = ltrim(file_get_contents($dir.'/composer.json'));
23+
if (null === $package = json_decode($json)) {
24+
passthru("composer validate $dir/composer.json");
25+
exit(1);
26+
}
2427

2528
$package->repositories = array(array(
2629
'type' => 'composer',

src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717

18+
/**
19+
* @group time-sensitive
20+
*/
1821
class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
1922
{
2023
private $requestStack;

src/Symfony/Component/Security/Core/composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"symfony/expression-language": "~2.8|~3.0",
2626
"symfony/http-foundation": "~2.8|~3.0",
2727
"symfony/ldap": "~2.8|~3.0",
28-
"symfony/translation": "~2.8|~3.0",
2928
"symfony/validator": "~2.8|~3.0",
3029
"psr/log": "~1.0"
3130
},

src/Symfony/Component/Security/composer.json

-5
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,12 @@
3535
"symfony/finder": "~2.8|~3.0",
3636
"symfony/polyfill-intl-icu": "~1.0",
3737
"symfony/routing": "~2.8|~3.0",
38-
"symfony/translation": "~2.8|~3.0",
3938
"symfony/validator": "~2.8|~3.0",
4039
"symfony/expression-language": "~2.8|~3.0",
4140
"symfony/ldap": "~2.8|~3.0",
42-
"doctrine/common": "~2.2",
43-
"doctrine/dbal": "~2.2",
4441
"psr/log": "~1.0"
4542
},
4643
"suggest": {
47-
"symfony/class-loader": "For using the ACL generateSql script",
48-
"symfony/finder": "For using the ACL generateSql script",
4944
"symfony/form": "",
5045
"symfony/validator": "For using the user password constraint",
5146
"symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs",

0 commit comments

Comments
 (0)