8000 Merge branch '2.3' into 2.5 · symfony/security-acl@d18c46b · GitHub
[go: up one dir, main page]
Skip to content

Commit d18c46b

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: Remove aligned '=>' and '=' Break infinite loop while resolving aliases [Security][listener] change priority of switchuser Improved the phpdoc for security token classes bumped Symfony version to 2.3.22 updated VERSION for 2.3.21 update CONTRIBUTORS for 2.3.21 updated CHANGELOG for 2.3.21 Conflicts: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bridge/Propel1/Form/Type/ModelType.php src/Symfony/Bridge/Propel1/Logger/PropelLogger.php src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php src/Symfony/Component/Console/Descriptor/JsonDescriptor.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php src/Symfony/Component/Form/Extension/Core/Type/FormType.php src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php src/Symfony/Component/Form/Extension/Core/Type/NumberType.php src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Validator/Constraints/ImageValidator.php src/Symfony/Component/Validator/Constraints/TypeValidator.php
2 parents 02c67a1 + 885f1a1 commit d18c46b

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎Domain/PermissionGrantingStrategy.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
2727
{
2828
const EQUAL = 'equal';
29-
const ALL = 'all';
30-
const ANY = 'any';
29+
const ALL = 'all';
30+
const ANY = 'any';
3131

3232
private $auditLogger;
3333

@@ -136,7 +136,7 @@ public function isFieldGranted(AclInterface $acl, $field, array $masks, array $s
136136
*/
137137
private function hasSufficientPermissions(AclInterface $acl, array $aces, array $masks, array $sids, $administrativeMode)
138138
{
139-
$firstRejectedAce = null;
139+
$firstRejectedAce = null;
140140

141141
foreach ($masks as $requiredMask) {
142142
foreach ($sids as $sid) {

‎Permission/BasicPermissionMap.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
*/
2020
class BasicPermissionMap implements PermissionMapInterface
2121
{
22-
const PERMISSION_VIEW = 'VIEW';
23-
const PERMISSION_EDIT = 'EDIT';
24-
const PERMISSION_CREATE = 'CREATE';
25-
const PERMISSION_DELETE = 'DELETE';
26-
const PERMISSION_UNDELETE = 'UNDELETE';
27-
const PERMISSION_OPERATOR = 'OPERATOR';
28-
const PERMISSION_MASTER = 'MASTER';
29-
const PERMISSION_OWNER = 'OWNER';
22+
const PERMISSION_VIEW = 'VIEW';
23+
const PERMISSION_EDIT = 'EDIT';
24+
const PERMISSION_CREATE = 'CREATE';
25+
const PERMISSION_DELETE = 'DELETE';
26+
const PERMISSION_UNDELETE = 'UNDELETE';
27+
const PERMISSION_OPERATOR = 'OPERATOR';
28+
const PERMISSION_MASTER = 'MASTER';
29+
const PERMISSION_OWNER = 'OWNER';
3030

3131
protected $map;
3232

‎Permission/MaskBuilder.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,28 @@
4444
*/
4545
class MaskBuilder
4646
{
47-
const MASK_VIEW = 1; // 1 << 0
48-
const MASK_CREATE = 2; // 1 << 1
49-
const MASK_EDIT = 4; // 1 << 2
50-
const MASK_DELETE = 8; // 1 << 3
51-
const MASK_UNDELETE = 16; // 1 << 4
52-
const MASK_OPERATOR = 32; // 1 << 5
53-
const MASK_MASTER = 64; // 1 << 6
54-
const MASK_OWNER = 128; // 1 << 7
55-
const MASK_IDDQD = 1073741823; // 1 << 0 | 1 << 1 | ... | 1 << 30
56-
57-
const CODE_VIEW = 'V';
58-
const CODE_CREATE = 'C';
59-
const CODE_EDIT = 'E';
60-
const CODE_DELETE = 'D';
61-
const CODE_UNDELETE = 'U';
62-
const CODE_OPERATOR = 'O';
63-
const CODE_MASTER = 'M';
64-
const CODE_OWNER = 'N';
65-
66-
const ALL_OFF = '................................';
67-
const OFF = '.';
68-
const ON = '*';
47+
const MASK_VIEW = 1; // 1 << 0
48+
const MASK_CREATE = 2; // 1 << 1
49+
const MASK_EDIT = 4; // 1 << 2
50+
const MASK_DELETE = 8; // 1 << 3
51+
const MASK_UNDELETE = 16; // 1 << 4
52+
const MASK_OPERATOR = 32; // 1 << 5
53+
const MASK_MASTER = 64; // 1 << 6
54+
const MASK_OWNER = 128; // 1 << 7
55+
const MASK_IDDQD = 1073741823; // 1 << 0 | 1 << 1 | ... | 1 << 30
56+
57+
const CODE_VIEW = 'V';
58+
const CODE_CREATE = 'C';
59+
const CODE_EDIT = 'E';
60+
const CODE_DELETE = 'D';
61+
const CODE_UNDELETE = 'U';
62+
const CODE_OPERATOR = 'O';
63+
const CODE_MASTER = 'M';
64+
const CODE_OWNER = 'N';
65+
66+
const ALL_OFF = '................................';
67+
const OFF = '.';
68+
const ON = '*';
6969

7070
private $mask;
7171

‎Resources/bin/generateSql.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717

1818
$loader = new ClassLoader();
1919
$loader->addPrefixes(array(
20-
'Symfony' => __DIR__.'/../../../../../..',
21-
'Doctrine\\Common' => __DIR__.'/../../../../../../../vendor/doctrine-common/lib',
20+
'Symfony' => __DIR__.'/../../../../../..',
21+
'Doctrine\\Common' => __DIR__.'/../../../../../../../vendor/doctrine-common/lib',
2222
'Doctrine\\DBAL\\Migrations' => __DIR__.'/../../../../../../../vendor/doctrine-migrations/lib',
23-
'Doctrine\\DBAL' => __DIR__.'/../../../../../../../vendor/doctrine-dbal/lib',
24-
'Doctrine' => __DIR__.'/../../../../../../../vendor/doctrine/lib',
23+
'Doctrine\\DBAL' => __DIR__.'/../../../../../../../vendor/doctrine-dbal/lib',
24+
'Doctrine' => __DIR__.'/../../../../../../../vendor/doctrine/lib',
2525
));
2626
$loader->register();
2727

2828
$schema = new Schema(array(
29-
'class_table_name' => 'acl_classes',
30-
'entry_table_name' => 'acl_entries',
31-
'oid_table_name' => 'acl_object_identities',
29+
'class_table_name' => 'acl_classes',
30+
'entry_table_name' => 'acl_entries',
31+
'oid_table_name' => 'acl_object_identities',
3232
'oid_ancestors_table_name' => 'acl_object_identity_ancestors',
33-
'sid_table_name' => 'acl_security_identities',
33+
'sid_table_name' => 'acl_security_identities',
3434
));
3535

3636
$reflection = new ReflectionClass('Doctrine\\DBAL\\Platforms\\AbstractPlatform');

0 commit comments

Comments
 (0)
0