Skip to content

Commit 8546eeb

Browse files
Merge branch '2.8'
Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/ContainerBuilder.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 src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
2 parents a7eff16 + 652bd95 commit 8546eeb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.9",
19+
"php": ">=5.5.9",
2020
"ext-ldap": "*"
2121
},
2222
"require-dev": {
23-
"symfony/phpunit-bridge": "~2.7|~3.0.0"
23+
"symfony/phpunit-bridge": "~2.8|~3.0"
2424
},
2525
"autoload": {
2626
"psr-4": { "Symfony\\Component\\Ldap\\": "" }

0 commit comments

Comments
 (0)