symfony · fabpot · Sep 18, 2013 · Sep 16, 2013 · Sep 18, 2013 · Sep 18, 2013
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -328,6 +328,10 @@ UPGRADE FROM 2.x to 3.0
    $route->setSchemes('https');
    ```
 
+### Security
+
+ * The `Resources/` directory was moved to `Core/Resources/`
+
 ### Translator
 
  * The `Translator::setFallbackLocale()` method has been removed in favor of

diff --git a/composer.json b/composer.json
@@ -49,6 +49,9 @@
         "symfony/proxy-manager-bridge": "self.version",
         "symfony/routing": "self.version",
         "symfony/security": "self.version",
+        "symfony/security-acl": "self.version",
+        "symfony/security-core": "self.version",
+        "symfony/security-http": "self.version",
         "symfony/security-bundle": "self.version",
         "symfony/serializer": "self.version",
         "symfony/stopwatch": "self.version",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -21,6 +21,7 @@
         <testsuite name="Symfony Test Suite">
             <directory>./src/Symfony/Bridge/*/Tests/</directory>
             <directory>./src/Symfony/Component/*/Tests/</directory>
+            <directory>./src/Symfony/Component/*/*/Tests/</directory>
             <directory>./src/Symfony/Bundle/*/Tests/</directory>
         </testsuite>
     </testsuites>
@@ -37,6 +38,7 @@
             <exclude>
                 <directory>./src/Symfony/Bridge/*/Tests</directory>
                 <directory>./src/Symfony/Component/*/Tests</directory>
+                <directory>./src/Symfony/Component/*/*/Tests</directory>
                 <directory>./src/Symfony/Bundle/*/Tests</directory>
                 <directory>./src/Symfony/Bundle/*/Resources</directory>
                 <directory>./src/Symfony/Component/*/Resources</directory>

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -566,7 +566,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
             $r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
 
-            $dirs[] = dirname($r->getFilename()).'/../../Resources/translations';
+            $dirs[] = dirname($r->getFilename()).'/../Resources/translations';
         }
         $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
         foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -184,19 +184,19 @@ public function testTranslator()
         $files = array_map(function($resource) { return realpath($resource[1]); }, $resources);
         $ref = new \ReflectionClass('Symfony\Component\Validator\Validator');
         $this->assertContains(
-            strtr(dirname($ref->getFileName()) . '/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds Validator translation resources'
         );
         $ref = new \ReflectionClass('Symfony\Component\Form\Form');
         $this->assertContains(
-            strtr(dirname($ref->getFileName()) . '/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds Form translation resources'
         );
         $ref = new \ReflectionClass('Symfony\Component\Security\Core\SecurityContext');
         $this->assertContains(
-            strtr(dirname(dirname($ref->getFileName())) . '/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr(dirname($ref->getFileName()).'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds Security translation resources'
         );

diff --git a/src/Symfony/Component/Security/Acl/.gitignore b/src/Symfony/Component/Security/Acl/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Security/Acl/LICENSE b/src/Symfony/Component/Security/Acl/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2013 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Security/Acl/README.md b/src/Symfony/Component/Security/Acl/README.md
@@ -0,0 +1,23 @@
+Security Component - ACL (Access Control List)
+==============================================
+
+Security provides an infrastructure for sophisticated authorization systems,
+which makes it possible to easily separate the actual authorization logic from
+so called user providers that hold the users credentials. It is inspired by
+the Java Spring framework.
+
+Resources
+---------
+
+Documentation:
+
+http://symfony.com/doc/2.4/book/security.html
+
+Tests
+-----
+
+You can run the unit tests with the following command:
+
+    $ cd path/to/Symfony/Component/Security/Acl/
+    $ composer.phar install --dev
+    $ phpunit
diff --git a/...sts/Acl/Dbal/AclProviderBenchmarkTest.php → ...l/Tests/Dbal/AclProviderBenchmarkTest.php b/...sts/Acl/Dbal/AclProviderBenchmarkTest.php → ...l/Tests/Dbal/AclProviderBenchmarkTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Dbal;
+namespace Symfony\Component\Security\Acl\Tests\Dbal;
 
 use Symfony\Component\Security\Acl\Dbal\AclProvider;
 use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;

diff --git a/...curity/Tests/Acl/Dbal/AclProviderTest.php → ...curity/Acl/Tests/Dbal/AclProviderTest.php b/...curity/Tests/Acl/Dbal/AclProviderTest.php → ...curity/Acl/Tests/Dbal/AclProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Dbal;
+namespace Symfony\Component\Security\Acl\Tests\Dbal;
 
 use Symfony\Component\Security\Acl\Dbal\AclProvider;
 use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;

diff --git a/...Tests/Acl/Dbal/MutableAclProviderTest.php → ...Acl/Tests/Dbal/MutableAclProviderTest.php b/...Tests/Acl/Dbal/MutableAclProviderTest.php → ...Acl/Tests/Dbal/MutableAclProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Dbal;
+namespace Symfony\Component\Security\Acl\Tests\Dbal;
 
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Model\FieldEntryInterface;

diff --git a/...ent/Security/Tests/Acl/Domain/AclTest.php → ...ent/Security/Acl/Tests/Domain/AclTest.php b/...ent/Security/Tests/Acl/Domain/AclTest.php → ...ent/Security/Acl/Tests/Domain/AclTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 

diff --git a/...rity/Tests/Acl/Domain/AuditLoggerTest.php → ...rity/Acl/Tests/Domain/AuditLoggerTest.php b/...rity/Tests/Acl/Domain/AuditLoggerTest.php → ...rity/Acl/Tests/Domain/AuditLoggerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 class AuditLoggerTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/...Tests/Acl/Domain/DoctrineAclCacheTest.php → ...Acl/Tests/Domain/DoctrineAclCacheTest.php b/...Tests/Acl/Domain/DoctrineAclCacheTest.php → ...Acl/Tests/Domain/DoctrineAclCacheTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;

diff --git a/...t/Security/Tests/Acl/Domain/EntryTest.php → ...t/Security/Acl/Tests/Domain/EntryTest.php b/...t/Security/Tests/Acl/Domain/EntryTest.php → ...t/Security/Acl/Tests/Domain/EntryTest.php
diff --git a/...urity/Tests/Acl/Domain/FieldEntryTest.php → ...urity/Acl/Tests/Domain/FieldEntryTest.php b/...urity/Tests/Acl/Domain/FieldEntryTest.php → ...urity/Acl/Tests/Domain/FieldEntryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\FieldEntry;
 

diff --git a/...n/ObjectIdentityRetrievalStrategyTest.php → ...n/ObjectIdentityRetrievalStrategyTest.php b/...n/ObjectIdentityRetrievalStrategyTest.php → ...n/ObjectIdentityRetrievalStrategyTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\ObjectIdentityRetrievalStrategy;
 

diff --git a/...y/Tests/Acl/Domain/ObjectIdentityTest.php → ...y/Acl/Tests/Domain/ObjectIdentityTest.php b/...y/Tests/Acl/Domain/ObjectIdentityTest.php → ...y/Acl/Tests/Domain/ObjectIdentityTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain
+namespace Symfony\Component\Security\Acl\Tests\Domain
 {
     use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 
@@ -26,10 +26,10 @@ public function testConstructor()
         // Test that constructor never changes passed type, even with proxies
         public function testConstructorWithProxy()
         {
-            $id = new ObjectIdentity('fooid', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject');
+            $id = new ObjectIdentity('fooid', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject');
 
             $this->assertEquals('fooid', $id->getIdentifier());
-            $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
+            $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType());
         }
 
         public function testFromDomainObjectPrefersInterfaceOverGetId()
@@ -54,14 +54,14 @@ public function testFromDomainObjectWithoutInterface()
         {
             $id = ObjectIdentity::fromDomainObject(new TestDomainObject());
             $this->assertEquals('getId()', $id->getIdentifier());
-            $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
+            $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType());
         }
 
         public function testFromDomainObjectWithProxy()
         {
-            $id = ObjectIdentity::fromDomainObject(new \Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject());
+            $id = ObjectIdentity::fromDomainObject(new \Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject());
             $this->assertEquals('getId()', $id->getIdentifier());
-            $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
+            $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType());
         }
 
         /**
@@ -101,9 +101,9 @@ public function getId()
     }
 }
 
-namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain
+namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain
 {
-    class TestDomainObject extends \Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject
+    class TestDomainObject extends \Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject
     {
     }
 }
diff --git a/...Domain/PermissionGrantingStrategyTest.php → ...Domain/PermissionGrantingStrategyTest.php b/...Domain/PermissionGrantingStrategyTest.php → ...Domain/PermissionGrantingStrategyTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;

diff --git a/...s/Acl/Domain/RoleSecurityIdentityTest.php → ...Tests/Domain/RoleSecurityIdentityTest.php b/...s/Acl/Domain/RoleSecurityIdentityTest.php → ...Tests/Domain/RoleSecurityIdentityTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 use Symfony\Component\Security\Core\Role\Role;

diff --git a/...SecurityIdentityRetrievalStrategyTest.php → ...SecurityIdentityRetrievalStrategyTest.php b/...SecurityIdentityRetrievalStrategyTest.php → ...SecurityIdentityRetrievalStrategyTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
@@ -88,7 +88,7 @@ public function getSecurityIdentityRetrievalTests()
                 new RoleSecurityIdentity('IS_AUTHENTICATED_ANONYMOUSLY'),
             )),
             array(new CustomUserImpl('johannes'), array('ROLE_FOO'), 'fullFledged', array(
-                new UserSecurityIdentity('johannes', 'Symfony\Component\Security\Tests\Acl\Domain\CustomUserImpl'),
+                new UserSecurityIdentity('johannes', 'Symfony\Component\Security\Acl\Tests\Domain\CustomUserImpl'),
                 new RoleSecurityIdentity('ROLE_FOO'),
                 new RoleSecurityIdentity('IS_AUTHENTICATED_FULLY'),
                 new RoleSecurityIdentity('IS_AUTHENTICATED_REMEMBERED'),

diff --git a/...s/Acl/Domain/UserSecurityIdentityTest.php → ...Tests/Domain/UserSecurityIdentityTest.php b/...s/Acl/Domain/UserSecurityIdentityTest.php → ...Tests/Domain/UserSecurityIdentityTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
@@ -27,10 +27,10 @@ public function testConstructor()
     // Test that constructor never changes the type, even for proxies
     public function testConstructorWithProxy()
     {
-        $id = new UserSecurityIdentity('foo', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\Foo');
+        $id = new UserSecurityIdentity('foo', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain\Foo');
 
         $this->assertEquals('foo', $id->getUsername());
-        $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\Foo', $id->getClass());
+        $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain\Foo', $id->getClass());
     }
 
     /**

diff --git a/...Acl/Permission/BasicPermissionMapTest.php → ...sts/Permission/BasicPermissionMapTest.php b/...Acl/Permission/BasicPermissionMapTest.php → ...sts/Permission/BasicPermissionMapTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Permission;
+namespace Symfony\Component\Security\Acl\Tests\Permission;
 
 use Symfony\Component\Security\Acl\Permission\BasicPermissionMap;
 

diff --git a/.../Tests/Acl/Permission/MaskBuilderTest.php → .../Acl/Tests/Permission/MaskBuilderTest.php b/.../Tests/Acl/Permission/MaskBuilderTest.php → .../Acl/Tests/Permission/MaskBuilderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Util;
+namespace Symfony\Component\Security\Acl\Tests\Util;
 
 use Symfony\Component\Security\Acl\Permission\MaskBuilder;
 

diff --git a/...Security/Tests/Acl/Voter/AclVoterTest.php → ...Security/Acl/Tests/Voter/AclVoterTest.php b/...Security/Tests/Acl/Voter/AclVoterTest.php → ...Security/Acl/Tests/Voter/AclVoterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Voter;
+namespace Symfony\Component\Security\Acl\Tests\Voter;
 
 use Symfony\Component\Security\Acl\Exception\NoAceFoundException;
 use Symfony\Component\Security\Acl\Voter\FieldVote;

diff --git a/src/Symfony/Component/Security/Acl/composer.json b/src/Symfony/Component/Security/Acl/composer.json
@@ -0,0 +1,42 @@
+{
+    "name": "symfony/security-acl",
+    "type": "library",
+    "description": "Symfony Security Component - ACL (Access Control List)",
+    "keywords": [],
+    "homepage": "http://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "http://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "symfony/security-core": "~2.4"
+    },
+    "require-dev": {
+        "doctrine/common": "~2.2",
+        "doctrine/dbal": "~2.2",
+        "psr/log": "~1.0"
+    },
+    "suggest": {
+        "symfony/class-loader": "",
+        "symfony/finder": "",
+        "doctrine/dbal": "to use the built-in ACL implementation"
+    },
+    "autoload": {
+        "psr-0": { "Symfony\\Component\\Security\\Acl\\": "" }
+    },
+    "target-dir": "Symfony/Component/Security/Acl",
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.4-dev"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Security/Acl/phpunit.xml.dist b/src/Symfony/Component/Security/Acl/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="Symfony Security Component ACL Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./vendor</directory>
+                <directory>./Tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>