Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 7ceca0a

Browse files
committed
feature #818 [2.3] Remove Acme Demo bundle (javiereguiluz)
This PR was merged into the 2.3 branch. Discussion ---------- [2.3] Remove Acme Demo bundle | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This removes the AcmeDemoBundle for Symfony Standard 2.3. I'm going to send another pull request for Symfony 2.6+. Commits ------- cdddfa0 Removed the "_error" path from the sample security.yml file 2e60a9f Simplified the security.yml configuration edc56be Removed AcmeDemoBundle
2 parents 2e506b7 + cdddfa0 commit 7ceca0a

31 files changed

+4
-701
lines changed

app/AppKernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public function registerBundles()
2020
);
2121

2222
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
23-
$bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
2423
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
2524
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
2625
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();

app/config/routing_dev.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ _configurator:
1212

1313
_main:
1414
resource: routing.yml
15-
16-
# AcmeDemoBundle routes (to be removed)
17-
_acme_demo:
18-
resource: "@AcmeDemoBundle/Resources/config/routing.yml"

app/config/security.yml

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
11
security:
2-
encoders:
3-
Symfony\Component\Security\Core\User\User: plaintext
4-
5-
role_hierarchy:
6-
ROLE_ADMIN: ROLE_USER
7-
ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
82

93
providers:
104
in_memory:
11-
memory:
12-
users:
13-
user: { password: userpass, roles: [ 'ROLE_USER' ] }
14-
admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
5+
memory: ~
156

167
firewalls:
178
dev:
18-
pattern: ^/(_(profiler|wdt)|css|images|js)/
19-
security: false
20-
21-
login:
22-
pattern: ^/demo/secured/login$
9+
pattern: ^/(_(profiler|wdt)|css|images|js)/
2310
security: false
2411

25-
secured_area:
26-
pattern: ^/demo/secured/
27-
form_login:
28-
check_path: _security_check
29-
login_path: _demo_login
30-
logout:
31-
path: _demo_logout
32-
target: _demo
33-
#anonymous: ~
34-
#http_basic:
35-
# realm: "Secured Demo Area"
36-
37-
access_control:
38-
- { path: ^/demo/secured/hello/admin/, roles: ROLE_ADMIN }
39-
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
12+
main:
13+
anonymous: ~

src/Acme/DemoBundle/AcmeDemoBundle.php

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/Acme/DemoBundle/Controller/DemoController.php

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/Acme/DemoBundle/Controller/SecuredController.php

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/Acme/DemoBundle/Controller/WelcomeController.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/Acme/DemoBundle/EventListener/ControllerListener.php

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/Acme/DemoBundle/Form/ContactType.php

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Acme/DemoBundle/Resources/config/routing.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Acme/DemoBundle/Resources/config/services.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)