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

[2.3] Remove Acme Demo bundle #818

Merged
merged 3 commits into from
Jun 11, 2015
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public function registerBundles()
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
Expand Down
4 changes: 0 additions & 4 deletions app/config/routing_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ _configurator:

_main:
resource: routing.yml

# AcmeDemoBundle routes (to be removed)
_acme_demo:
resource: "@AcmeDemoBundle/Resources/config/routing.yml"
34 changes: 4 additions & 30 deletions app/config/security.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,13 @@
security:
encoders:
Symfony\Component\Security\Core\User\User: plaintext

role_hierarchy:
ROLE_ADMIN: ROLE_USER
ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]

providers:
in_memory:
memory:
users:
user: { password: userpass, roles: [ 'ROLE_USER' ] }
admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
memory: ~

firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false

login:
pattern: ^/demo/secured/login$
pattern: ^/(_(profiler|wdt|error)|css|images|js)/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need the |error part here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's part of the Twig bundle IIRC, and allows you to check your error
templates, so I'd say yes, we might need it :)

2015-06-11 12:58 GMT+02:00 Christian Flothmann [email protected]:

In app/config/security.yml
#818 (comment)
:

 firewalls:
     dev:
  •        pattern:  ^/(_(profiler|wdt)|css|images|js)/
    

- security: false

  •    login:
    
  •        pattern:  ^/demo/secured/login$
    
  •        pattern: ^/(_(profiler|wdt|error)|css|images|js)/
    

Do we really need the |error part here?


Reply to this email directly or view it on GitHub
https://github.com/symfony/symfony-standard/pull/818/files#r32209761.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but only in Symfony 2.6 or higher.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xabbuh you are right. I've just remoed _error path for 2.3. Thanks.

security: false

secured_area:
pattern: ^/demo/secured/
form_login:
check_path: _security_check
login_path: _demo_login
logout:
path: _demo_logout
target: _demo
#anonymous: ~
#http_basic:
# realm: "Secured Demo Area"

access_control:
- { path: ^/demo/secured/hello/admin/, roles: ROLE_ADMIN }
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
main:
anonymous: ~
9 changes: 0 additions & 9 deletions src/Acme/DemoBundle/AcmeDemoBundle.php

This file was deleted.

57 changes: 0 additions & 57 deletions src/Acme/DemoBundle/Controller/DemoController.php

This file was deleted.

68 changes: 0 additions & 68 deletions src/Acme/DemoBundle/Controller/SecuredController.php

This file was deleted.

18 changes: 0 additions & 18 deletions src/Acme/DemoBundle/Controller/WelcomeController.php

This file was deleted.

22 changes: 0 additions & 22 deletions src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php

This file was deleted.

24 changes: 0 additions & 24 deletions src/Acme/DemoBundle/EventListener/ControllerListener.php

This file was deleted.

20 changes: 0 additions & 20 deletions src/Acme/DemoBundle/Form/ContactType.php

This file was deleted.

12 changes: 0 additions & 12 deletions src/Acme/DemoBundle/Resources/config/routing.yml

This file was deleted.

18 changes: 0 additions & 18 deletions src/Acme/DemoBundle/Resources/config/services.xml

This file was deleted.

Loading