8000 Merge branch '2.8' · symfony/symfony@7b80589 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7b80589

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8'
Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json
2 parents d5deec9 + 5326df0 commit 7b80589

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"paragonie/random_compat" : "~1.0"
20+
"paragonie/random_compat": "~1.0"
2121
},
2222
"require-dev": {
2323
"symfony/phpunit-bridge": "~2.8|~3.0",

‎src/Symfony/Component/Security/Csrf/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"symfony/security-core": "~2.8|~3.0",
21-
"paragonie/random_compat" : "~1.0"
21+
"paragonie/random_compat": "~1.0"
2222
},
2323
"require-dev": {
2424
"symfony/phpunit-bridge": "~2.8|~3.0",

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-foundation": "~2.8|~3.0",
2323
"symfony/http-kernel": "~2.8|~3.0",
2424
"symfony/property-access": "~2.8|~3.0",
25-
"paragonie/random_compat" : "~1.0"
25+
"paragonie/random_compat": "~1.0"
2626
},
2727
"require-dev": {
2828
"symfony/phpunit-bridge": "~2.8|~3.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/http-foundation": "~2.8|~3.0",
2222
"symfony/http-kernel": "~2.8|~3.0",
2323
"symfony/property-access": "~2.8|~3.0",
24-
"paragonie/random_compat" : "~1.0"
24+
"paragonie/random_compat": "~1.0"
2525
},
2626
"replace": {
2727
"symfony/security-core": "self.version",

0 commit comments

Comments
 (0)
0