8000 minor #9594 [Security] Fixed typos/CS/PHPDoc (pborreli) · jderusse/symfony@b7a46e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit b7a46e5

Browse files
fabpotfabpot
committed
minor symfony#9594 [Security] Fixed typos/CS/PHPDoc (pborreli)
This PR was merged into the master branch. Discussion ---------- [Security] Fixed typos/CS/PHPDoc Commits ------- e1110de Fixed typos/CS/PHPDoc
2 parents 6dc9e29 + 611f916 commit b7a46e5

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎Dbal/AclProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ public function findAcls(array $oids, array $sids = array())
165165
if ((self::MAX_BATCH_SIZE === count($currentBatch) || ($i + 1) === $c) && count($currentBatch) > 0) {
166166
try {
167167
$loadedBatch = $this->lookupObjectIdentities($currentBatch, $sids, $oidLookup);
168-
} catch (AclNotFoundException $aclNotFoundexception) {
168+
} catch (AclNotFoundException $aclNotFoundException) {
169169
if ($result->count()) {
170170
$partialResultException = new NotAllAclsFoundException('The provider could not find ACLs for all object identities.');
171171
$partialResultException->setPartialResult($result);
172172
throw $partialResultException;
173173
} else {
174-
throw $aclNotFoundexception;
174+
throw $aclNotFoundException;
175175
}
176176
}
177177
foreach ($loadedBatch as $loadedOid) {

‎Dbal/MutableAclProvider.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function updateAcl(MutableAclInterface $acl)
253253
}
254254

255255
// check properties for deleted, and created ACEs, and perform deletions
256-
// we need to perfom deletions before updating existing ACEs, in order to
256+
// we need to perform deletions before updating existing ACEs, in order to
257257
// preserve uniqueness of the order field
258258
if (isset($propertyChanges['classAces'])) {
259259
$this->updateOldAceProperty('classAces', $propertyChanges['classAces']);
@@ -360,7 +360,7 @@ public function updateAcl(MutableAclInterface $acl)
360360
protected function getDeleteAccessControlEntriesSql($oidPK)
361361
{
362362
return sprintf(
363-
'DELETE FROM %s WHERE object_identity_id = %d',
363+
'DELETE FROM %s WHERE object_identity_id = %d',
364364
$this->options['entry_table_name'],
365365
$oidPK
366366
);
@@ -806,7 +806,7 @@ private function updateNewFieldAceProperty($name, array $changes)
806806
* @param string $name
807807
* @param array $changes
808808
*/
809-
private function updateOldFieldAceProperty($ane, array $changes)
809+
private function updateOldFieldAceProperty($name, array $changes)
810810
{
811811
$currentIds = array();
812812
foreach ($changes[1] as $field => $new) {
@@ -925,11 +925,12 @@ private function updateAce(\SplObjectStorage $aces, $ace)
925925
if (isset($propertyChanges['aceOrder'])
926926
&& $propertyChanges['aceOrder'][1] > $propertyChanges['aceOrder'][0]
927927
&& $propertyChanges == $aces->offsetGet($ace)) {
928-
$aces->next();
929-
if ($aces->valid()) {
928+
929+
$aces->next();
930+
if ($aces->valid()) {
930931
$this->updateAce($aces, $aces->current());
931-
}
932932
}
933+
}
933934

934935
if (isset($propertyChanges['mask'])) {
935936
$sets[] = sprintf('mask = %d', $propertyChanges['mask'][1]);
@@ -949,5 +950,4 @@ private function updateAce(\SplObjectStorage $aces, $ace)
949950

950951
$this->connection->executeQuery($this->getUpdateAccessControlEntrySql($ace->getId(), $sets));
951952
}
952-
953953
}

‎Tests/Domain/AuditLoggerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public function testLogIfNeeded($granting, $audit)
2626
->expects($this->once())
2727
->method('isAuditSuccess')
2828
->will($this->returnValue($audit))
29-
;
29+
;
3030

31-
$ace
31+
$ace
3232
->expects($this->never())
3333
->method('isAuditFailure')
34-
;
34+
;
3535
} else {
3636
$ace
3737
->expects($this->never())

0 commit comments

Comments
 (0)
0