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

removed non-MIT/BSD licensed bundles (closes #442) #535

Merged
merged 1 commit into from
Apr 30, 2013
Merged

removed non-MIT/BSD licensed bundles (closes #442) #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,24 +140,21 @@ It comes pre-configured with the following bundles:
* [**AsseticBundle**][12] - Adds support for Assetic, an asset processing
library

* [**JMSSecurityExtraBundle**][13] - Allows security to be added via
annotations

* [**JMSDiExtraBundle**][14] - Adds more powerful dependency injection
features

* **WebProfilerBundle** (in dev/test env) - Adds profiling functionality and
the web debug toolbar

* **SensioDistributionBundle** (in dev/test env) - Adds functionality for
configuring and working with Symfony distributions

* [**SensioGeneratorBundle**][15] (in dev/test env) - Adds code generation
* [**SensioGeneratorBundle**][13] (in dev/test env) - Adds code generation
capabilities

* **AcmeDemoBundle** (in dev/test env) - A demo bundle with some example
code

All libraries and bundles included in the Symfony Standard Edition are
released under the MIT or BSD license.

Enjoy!

[1]: http://symfony.com/doc/2.1/book/installation.html
Expand All @@ -172,6 +169,4 @@ Enjoy!
[10]: http://symfony.com/doc/2.1/cookbook/email.html
[11]: http://symfony.com/doc/2.1/cookbook/logging/monolog.html
[12]: http://symfony.com/doc/2.1/cookbook/assetic/asset_management.html
[13]: http://jmsyst.com/bundles/JMSSecurityExtraBundle/master
[14]: http://jmsyst.com/bundles/JMSDiExtraBundle/master
[15]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html
[13]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html
3 changes: 0 additions & 3 deletions app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ public function registerBundles()
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new JMS\AopBundle\JMSAopBundle(),
new JMS\DiExtraBundle\JMSDiExtraBundle($this),
new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Expand Down
5 changes: 1 addition & 4 deletions app/config/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
jms_security_extra:
secure_all_services: false
expressions: true

security:
encoders:
Symfony\Component\Security\Core\User\User: plaintext
Expand Down Expand Up @@ -39,4 +35,5 @@ security:
# realm: "Secured Demo Area"

access_control:
- { path: ^/demo/secured/hello/admin/, roles: ROLE_ADMIN }
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
4 changes: 1 addition & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
"symfony/monolog-bundle": "2.2.*",
"sensio/distribution-bundle": "2.2.*",
"sensio/framework-extra-bundle": "2.2.*",
"sensio/generator-bundle": "2.2.*",
"jms/security-extra-bundle": "1.4.*",
"jms/di-extra-bundle": "1.3.*"
"sensio/generator-bundle": "2.2.*"
},
"scripts": {
"post-install-cmd": [
Expand Down
Loading