Navigation Menu

Skip to content

Commit

Permalink
feature #24348 [SecurityBundle] Remove remaining ACL stuff from Secur…
Browse files Browse the repository at this point in the history
…ityBundle (ogizanagi)

This PR was merged into the 4.0-dev branch.

Discussion
----------

[SecurityBundle] Remove remaining ACL stuff from SecurityBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Some more stuff to remove forgotten by #24341

Commits
-------

c8c3d42 [SecurityBundle] Remove remaining ACL stuff from SecurityBundle
  • Loading branch information
fabpot committed Sep 27, 2017
2 parents ac579ea + c8c3d42 commit 88be8f6
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 267 deletions.
Expand Up @@ -19,15 +19,7 @@
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;

/**
* This class contains the configuration information.
*
* This information is for the following tags:
*
* * security.config
* * security.acl
*
* This information is solely responsible for how the different configuration
* sections are normalized, and merged.
* SecurityExtension configuration structure.
*
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -11,7 +11,6 @@

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

use Doctrine\ORM\Version;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpKernel\Kernel;
Expand Down Expand Up @@ -83,11 +82,6 @@ public function getLogDir()
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->rootConfig);

// to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
if ('Acl' === $this->testCase && class_exists(Version::class)) {
$loader->load(__DIR__.'/Acl/doctrine.yml');
}
}

public function serialize()
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/SecurityBundle/composer.json
Expand Up @@ -32,7 +32,6 @@
"symfony/form": "~3.4|~4.0",
"symfony/framework-bundle": "~3.4|~4.0",
"symfony/http-foundation": "~3.4|~4.0",
"symfony/security-acl": "~2.8|~3.0",
"symfony/translation": "~3.4|~4.0",
"symfony/twig-bundle": "~3.4|~4.0",
"symfony/twig-bridge": "~3.4|~4.0",
Expand All @@ -50,9 +49,6 @@
"symfony/framework-bundle": "<3.4",
"symfony/console": "<3.4"
},
"suggest": {
"symfony/security-acl": "For using the ACL functionality of this bundle"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
"exclude-from-classmap": [
Expand Down

0 comments on commit 88be8f6

Please sign in to comment.