diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-12-28 14:11:03 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-12-28 14:11:03 +0100 |
| commit | 80fb7e225c48dc08f86112e8924d3656f68d4781 (patch) | |
| tree | b7ae24b2b2a4671897e987f36848698a23964536 | |
| parent | 88b9dd021f396ecea0ed312b26e2e8fe5b98feeb (diff) | |
| parent | 34eee889f4596b7b713e5be1d1cf3d4f1810a06e (diff) | |
| download | symfony-security-80fb7e225c48dc08f86112e8924d3656f68d4781.zip symfony-security-80fb7e225c48dc08f86112e8924d3656f68d4781.tar.gz symfony-security-80fb7e225c48dc08f86112e8924d3656f68d4781.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
[travis] timeout the sigchild tests at 60s
CS: Single line comments should use double slashes (//) and not hash (#).
Do not use HttpKernel Extension when not needed
bumped Symfony version to 2.3.37
updated VERSION for 2.3.36
update CONTRIBUTORS for 2.3.36
updated CHANGELOG for 2.3.36
use nowdoc instead of heredoc
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
| -rw-r--r-- | Acl/Dbal/AclProvider.php | 2 | ||||
| -rw-r--r-- | Acl/Dbal/MutableAclProvider.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index 64102d2..6709023 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -369,7 +369,7 @@ FINDCHILDREN; */ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid) { - $query = <<<QUERY + $query = <<<'QUERY' SELECT o.id FROM %s o INNER JOIN %s c ON c.id = o.class_id diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index bf08f60..906ad73 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -458,7 +458,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf */ protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure) { - $query = <<<QUERY + $query = <<<'QUERY' INSERT INTO %s ( class_id, object_identity_id, @@ -535,7 +535,7 @@ QUERY; */ protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInheriting) { - $query = <<<QUERY + $query = <<<'QUERY' INSERT INTO %s (class_id, object_identifier, entries_inheriting) VALUES (%d, %s, %s) QUERY; |