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

Commit 080ac32

Browse files
fabpotfabpot
committed
Merge branch '2.5' into 2.6
* 2.5: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolver.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Stopwatch/Stopwatch.php src/Symfony/Component/Translation/Loader/XliffFileLoader.php src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
2 parents f54d46e + 2071121 commit 080ac32

File tree

56 files changed

+155
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+155
-150
lines changed

‎Acl/Dbal/MutableAclProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function findAcls(array $oids, array $sids = array())
152152
}
153153

154154
/**
155-
* Implementation of PropertyChangedListener
155+
* Implementation of PropertyChangedListener.
156156
*
157157
* This allows us to keep track of which values have been changed, so we don't
158158
* have to do a full introspection when ->updateAcl() is called.
@@ -742,7 +742,7 @@ protected function getUpdateAccessControlEntrySql($pk, array $sets)
742742
}
743743

744744
/**
745-
* Creates the ACL for the passed object identity
745+
* Creates the ACL for the passed object identity.
746746
*
747747
* @param ObjectIdentityInterface $oid
748748
*/

‎Acl/Dbal/Schema.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class Schema extends BaseSchema
2424
protected $options;
2525

2626
/**
27-
* Constructor
27+
* Constructor.
2828
*
2929
* @param array $options the names for tables
3030
* @param Connection $connection
@@ -61,7 +61,7 @@ public function addToSchema(BaseSchema $schema)
6161
}
6262

6363
/**
64-
* Adds the class table to the schema
64+
* Adds the class table to the schema.
6565
*/
6666
protected function addClassTable()
6767
{
@@ -73,7 +73,7 @@ protected function addClassTable()
7373
}
7474

7575
/**
76-
* Adds the entry table to the schema
76+
* Adds the entry table to the schema.
7777
*/
7878
protected function addEntryTable()
7979
{
@@ -101,7 +101,7 @@ protected function addEntryTable()
101101
}
102102

103103
/**
104-
* Adds the object identity table to the schema
104+
* Adds the object identity table to the schema.
105105
*/
106106
protected function addObjectIdentitiesTable()
107107
{
@@ -121,7 +121,7 @@ protected function addObjectIdentitiesTable()
121121
}
122122

123123
/**
124-
* Adds the object identity relation table to the schema
124+
* Adds the object identity relation table to the schema.
125125
*/
126126
protected function addObjectIdentityAncestorsTable()
127127
{
@@ -138,7 +138,7 @@ protected function addObjectIdentityAncestorsTable()
138138
}
139139

140140
/**
141-
* Adds the security identity table to the schema
141+
* Adds the security identity table to the schema.
142142
*/
143143
protected function addSecurityIdentitiesTable()
144144
{

‎Acl/Domain/Acl.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
4747
private $listeners = array();
4848

4949
/**
50-
* Constructor
50+
* Constructor.
5151
*
5252
* @param int $id
5353
* @param ObjectIdentityInterface $objectIdentity
@@ -65,7 +65,7 @@ public function __construct($id, ObjectIdentityInterface $objectIdentity, Permis
6565
}
6666

6767
/**
68-
* Adds a property changed listener
68+
* Adds a property changed listener.
6969
*
7070
* @param PropertyChangedListener $listener
7171
*/
@@ -250,7 +250,7 @@ public function isSidLoaded($sids)
250250
}
251251

252252
/**
253-
* Implementation for the \Serializable interface
253+
* Implementation for the \Serializable interface.
254254
*
255255
* @return string
256256
*/
@@ -270,7 +270,7 @@ public function serialize()
270270
}
271271

272272
/**
273-
* Implementation for the \Serializable interface
273+
* Implementation for the \Serializable interface.
274274
*
275275
* @param string $serialized
276276
*/
@@ -389,7 +389,7 @@ public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditF
389389
}
390390

391391
/**
392-
* Deletes an ACE
392+
* Deletes an ACE.
393393
*
394394
* @param string $property
395395
* @param int $index
@@ -414,7 +414,7 @@ private function deleteAce($property, $index)
414414
}
415415

416416
/**
417-
* Deletes a field-based ACE
417+
* Deletes a field-based ACE.
418418
*
419419
* @param string $property
420420
* @param int $index
@@ -440,7 +440,7 @@ private function deleteFieldAce($property, $index, $field)
440440
}
441441

442442
/**
443-
* Inserts an ACE
443+
* Inserts an ACE.
444444
*
445445
* @param string $property
446446
* @param int $index
@@ -489,7 +489,7 @@ private function insertAce($property, $index, $mask, SecurityIdentityInterface $
489489
}
490490

491491
/**
492-
* Inserts a field-based ACE
492+
* Inserts a field-based ACE.
493493
*
494494
* @param string $property
495495
* @param int $index
@@ -547,7 +547,7 @@ private function insertFieldAce($property, $index, $field, $mask, SecurityIdenti
547547
}
548548

549549
/**
550-
* Updates an ACE
550+
* Updates an ACE.
551551
*
552552
* @param string $property
553553
* @param int $index
@@ -575,7 +575,7 @@ private function updateAce($property, $index, $mask, $strategy = null)
575575
}
576576

577577
/**
578-
* Updates auditing for an ACE
578+
* Updates auditing for an ACE.
579579
*
580580
* @param array &$aces
581581
* @param int $index
@@ -602,7 +602,7 @@ private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailu
602602
}
603603

604604
/**
605-
* Updates a field-based ACE
605+
* Updates a field-based ACE.
606606
*
607607
* @param string $property
608608
* @param int $index
@@ -636,7 +636,7 @@ private function updateFieldAce($property, $index, $field, $mask, $strategy = nu
636636
}
637637

638638
/**
639-
* Called when a property of the ACL changes
639+
* Called when a property of the ACL changes.
640640
*
641641
* @param string $name
642642
* @param mixed $oldValue
@@ -650,7 +650,7 @@ private function onPropertyChanged($name, $oldValue, $newValue)
650650
}
651651

652652
/**
653-
* Called when a property of an ACE associated with this ACL changes
653+
* Called when a property of an ACE associated with this ACL changes.
654654
*
655655
* @param EntryInterface $entry
656656
* @param string $name

‎Acl/Domain/AuditLogger.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
use Symfony\Component\Security\Acl\Model\AuditLoggerInterface;
1717

1818
/**
19-
* Base audit logger implementation
19+
* Base audit logger implementation.
2020
*
2121
* @author Johannes M. Schmitt <[email protected]>
2222
*/
2323
abstract class AuditLogger implements AuditLoggerInterface
2424
{
2525
/**
26-
* Performs some checks if logging was requested
26+
* Performs some checks if logging was requested.
2727
*
2828
* @param bool $granted
2929
* @param EntryInterface $ace
@@ -42,7 +42,7 @@ public function logIfNeeded($granted, EntryInterface $ace)
4242
}
4343

4444
/**
45-
* This method is only called when logging is needed
45+
* This method is only called when logging is needed.
4646
*
4747
* @param bool $granted
4848
* @param EntryInterface $ace

‎Acl/Domain/DoctrineAclCache.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class DoctrineAclCache implements AclCacheInterface
3232
private $permissionGrantingStrategy;
3333

3434
/**
35-
* Constructor
35+
* Constructor.
3636
*
3737
* @param Cache $cache
3838
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
@@ -203,7 +203,7 @@ private function unserializeAcl($serialized)
203203
}
204204

205205
/**
206-
* Returns the key for the object identity
206+
* Returns the key for the object identity.
207207
*
208208
* @param ObjectIdentityInterface $oid
209209
*
@@ -216,7 +216,7 @@ private function getDataKeyByIdentity(ObjectIdentityInterface $oid)
216216
}
217217

218218
/**
219-
* Returns the alias key for the object identity key
219+
* Returns the alias key for the object identity key.
220220
*
221221
* @param string $aclId
222222
*

‎Acl/Domain/Entry.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
1717

1818
/**
19-
* Auditable ACE implementation
19+
* Auditable ACE implementation.
2020
*
2121
* @author Johannes M. Schmitt <[email protected]>
2222
*/
@@ -32,7 +32,7 @@ class Entry implements AuditableEntryInterface
3232
private $granting;
3333

3434
/**
35-
* Constructor
35+
* Constructor.
3636
*
3737
* @param int $id
3838
* @param AclInterface $acl
@@ -146,7 +146,7 @@ public function setAuditSuccess($boolean)
146146
}
147147

148148
/**
149-
* Sets the permission mask
149+
* Sets the permission mask.
150150
*
151151
* Do never call this method directly. Use the respective methods on the
152152
* AclInterface instead.
@@ -159,7 +159,7 @@ public function setMask($mask)
159159
}
160160

161161
/**
162-
* Sets the mask comparison strategy
162+
* Sets the mask comparison strategy.
163163
*
164164
* Do never call this method directly. Use the respective methods on the
165165
* AclInterface instead.
@@ -172,7 +172,7 @@ public function setStrategy($strategy)
172172
}
173173

174174
/**
175-
* Implementation of \Serializable
175+
* Implementation of \Serializable.
176176
*
177177
* @return string
178178
*/
@@ -190,7 +190,7 @@ public function serialize()
190190
}
191191

192192
/**
193-
* Implementation of \Serializable
193+
* Implementation of \Serializable.
194194
*
195195
* @param string $serialized
196196
*/

‎Acl/Domain/FieldEntry.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
1717

1818
/**
19-
* Field-aware ACE implementation which is auditable
19+
* Field-aware ACE implementation which is auditable.
2020
*
2121
* @author Johannes M. Schmitt <[email protected]>
2222
*/
@@ -25,7 +25,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
2525
private $field;
2626

2727
/**
28-
* Constructor
28+
* Constructor.
2929
*
3030
* @param int $id
3131
* @param AclInterface $acl

‎Acl/Domain/ObjectIdentity.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface;
1818

1919
/**
20-
* ObjectIdentity implementation
20+
* ObjectIdentity implementation.
2121
*
2222
* @author Johannes M. Schmitt <[email protected]>
2323
*/
@@ -48,7 +48,7 @@ public function __construct($identifier, $type)
4848
}
4949

5050
/**
51-
* Constructs an ObjectIdentity for the given domain object
51+
* Constructs an ObjectIdentity for the given domain object.
5252
*
5353
* @param object $domainObject
5454
*
@@ -103,7 +103,7 @@ public function equals(ObjectIdentityInterface $identity)
103103
}
104104

105105
/**
106-
* Returns a textual representation of this object identity
106+
* Returns a textual representation of this object identity.
107107
*
108108
* @return string
109109
*/

‎Acl/Domain/ObjectIdentityRetrievalStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface;
1616

1717
/**
18-
* Strategy to be used for retrieving object identities from domain objects
18+
* Strategy to be used for retrieving object identities from domain objects.
1919
*
2020
* @author Johannes M. Schmitt <[email protected]>
2121
*/

‎Acl/Domain/PermissionGrantingStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
3232
private $auditLogger;
3333

3434
/**
35-
* Sets the audit logger
35+
* Sets the audit logger.
3636
*
3737
* @param AuditLoggerInterface $auditLogger
3838
*/

0 commit comments

Comments
 (0)