Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c8c3d42

Browse filesBrowse files
ogizanagiogizanagi
committed
[SecurityBundle] Remove remaining ACL stuff from SecurityBundle
1 parent c88158a commit c8c3d42
Copy full SHA for c8c3d42

File tree

14 files changed

+1
-263
lines changed
Filter options

14 files changed

+1
-263
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+1-9Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,7 @@
1919
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
2020

2121
/**
22-
* This class contains the configuration information.
23-
*
24-
* This information is for the following tags:
25-
*
26-
* * security.config
27-
* * security.acl
28-
*
29-
* This information is solely responsible for how the different configuration
30-
* sections are normalized, and merged.
22+
* SecurityExtension configuration structure.
3123
*
3224
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
3325
*/

‎src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/EventListener/AclSchemaListener.php
-36Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
-35Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
-49Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/custom_acl_provider.php
-9Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/custom_acl_provider.xml
-16Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/custom_acl_provider.yml
-6Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/AclBundle.php
-21Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AclBundle/Entity/Car.php
-22Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php
-17Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/config.yml
-28Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml
-5Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional\app;
1313

14-
use Doctrine\ORM\Version;
1514
use Symfony\Component\Config\Loader\LoaderInterface;
1615
use Symfony\Component\Filesystem\Filesystem;
1716
use Symfony\Component\HttpKernel\Kernel;
@@ -83,11 +82,6 @@ public function getLogDir()
8382
public function registerContainerConfiguration(LoaderInterface $loader)
8483
{
8584
$loader->load($this->rootConfig);
86-
87-
// to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
88-
if ('Acl' === $this->testCase && class_exists(Version::class)) {
89-
$loader->load(__DIR__.'/Acl/doctrine.yml');
90-
}
9185
}
9286

9387
public function serialize()

‎src/Symfony/Bundle/SecurityBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/composer.json
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"symfony/form": "~3.4|~4.0",
3333
"symfony/framework-bundle": "~3.4|~4.0",
3434
"symfony/http-foundation": "~3.4|~4.0",
35-
"symfony/security-acl": "~2.8|~3.0",
3635
"symfony/translation": "~3.4|~4.0",
3736
"symfony/twig-bundle": "~3.4|~4.0",
3837
"symfony/twig-bridge": "~3.4|~4.0",
@@ -50,9 +49,6 @@
5049
"symfony/framework-bundle": "<3.4",
5150
"symfony/console": "<3.4"
5251
},
53-
"suggest": {
54-
"symfony/security-acl": "For using the ACL functionality of this bundle"
55-
},
5652
"autoload": {
5753
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
5854
"exclude-from-classmap": [

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.