Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 71583a6

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: Fix small coding style [2.3] Static Code Analysis for Components [Form] fixed phpdoc CS: Convert double quotes to single quotes Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader. [Validator] added Japanese translation for unmatched charset (id: 80) [WebProfilerBundle] fixed undefined buttons. [WebProfilerBundle] Fix javascript toolbar on IE8 [DependencyInjection] Highest precedence for user parameters bumped Symfony version to 2.6.6 [Translation][MoFileLoader] fixed load empty translation. updated VERSION for 2.6.5 updated CHANGELOG for 2.6.5 bumped Symfony version to 2.3.27 updated VERSION for 2.3.26 update CONTRIBUTORS for 2.3.26 updated CHANGELOG for 2.3.26 [HttpKernel] UriSigner::buildUrl - default params for http_build_query Conflicts: src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2 parents 392a5d1 + 14ee647 commit 71583a6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Acl/Tests/Dbal/AclProviderBenchmarkTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testFindAcls()
5656

5757
// get some random test object identities from the database
5858
$oids = array();
59-
$stmt = $this->con->executeQuery("SELECT object_identifier, class_type FROM acl_object_identities o INNER JOIN acl_classes c ON c.id = o.class_id ORDER BY RAND() LIMIT 25");
59+
$stmt = $this->con->executeQuery('SELECT object_identifier, class_type FROM acl_object_identities o INNER JOIN acl_classes c ON c.id = o.class_id ORDER BY RAND() LIMIT 25');
6060
foreach ($stmt->fetchAll() as $oid) {
6161
$oids[] = new ObjectIdentity($oid['object_identifier'], $oid['class_type']);
6262
}
@@ -66,7 +66,7 @@ public function testFindAcls()
6666
$start = microtime(true);
6767
$provider->findAcls($oids);
6868
$time = microtime(true) - $start;
69-
echo "Total Time: ".$time."s\n";
69+
echo 'Total Time: '.$time."s\n";
7070
}
7171

7272
/**
@@ -77,7 +77,7 @@ protected function generateTestData()
7777
{
7878
$sm = $this->con->getSchemaManager();
7979
$sm->dropAndCreateDatabase('testdb');
80-
$this->con->exec("USE testdb");
80+
$this->con->exec('USE testdb');
8181

8282
// import the schema
8383
$schema = new Schema($options = $this->getOptions());

Acl/Tests/Dbal/MutableAclProviderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ protected function importAcls(AclProvider $provider, array $data)
478478

479479
if (isset($aclData['parent_acl'])) {
480480
if (isset($aclIds[$aclData['parent_acl']])) {
481-
$con->executeQuery("UPDATE acl_object_identities SET parent_object_identity_id = ".$aclIds[$aclData['parent_acl']]." WHERE id = ".$aclId);
481+
$con->executeQuery('UPDATE acl_object_identities SET parent_object_identity_id = '.$aclIds[$aclData['parent_acl']].' WHERE id = '.$aclId);
482482
$con->executeQuery($this->callMethod($provider, 'getInsertObjectIdentityRelationSql', array($aclId, $aclIds[$aclData['parent_acl']])));
483483
} else {
484484
$parentAcls[$aclId] = $aclData['parent_acl'];
@@ -491,7 +491,7 @@ protected function importAcls(AclProvider $provider, array $data)
491491
throw new \InvalidArgumentException(sprintf('"%s" does not exist.', $name));
492492
}
493493

494-
$con->executeQuery(sprintf("UPDATE acl_object_identities SET parent_object_identity_id = %d WHERE id = %d", $aclIds[$name], $aclId));
494+
$con->executeQuery(sprintf('UPDATE acl_object_identities SET parent_object_identity_id = %d WHERE id = %d', $aclIds[$name], $aclId));
495495
$con->executeQuery($this->callMethod($provider, 'getInsertObjectIdentityRelationSql', array($aclId, $aclIds[$name])));
496496
}
497497

Core/Authentication/Provider/DaoAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke
5959
throw new BadCredentialsException('The credentials were changed from another session.');
6060
}
6161
} else {
62-
if ("" === ($presentedPassword = $token->getCredentials())) {
62+
if ('' === ($presentedPassword = $token->getCredentials())) {
6363
throw new BadCredentialsException('The presented password cannot be empty.');
6464
}
6565

Core/Tests/Authorization/AccessDecisionManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ protected function getVoterFor2Roles($token, $vote1, $vote2)
107107
$voter->expects($this->exactly(2))
108108
->method('vote')
109109
->will($this->returnValueMap(array(
110-
array($token, null, array("ROLE_FOO"), $vote1),
111-
array($token, null, array("ROLE_BAR"), $vote2),
110+
array($token, null, array('ROLE_FOO'), $vote1),
111+
array($token, null, array('ROLE_BAR'), $vote2),
112112
)))
113113
;
114114

0 commit comments

Comments
 (0)