From d84850acafb291bd3ae15e87c6b5aa389fe810cf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 26 Apr 2013 09:12:36 +0200 Subject: [PATCH] removed non-MIT/BSD licensed bundles and librairies --- README.md | 15 +- app/AppKernel.php | 3 - app/config/security.yml | 5 +- composer.json | 4 +- composer.lock | 446 ++---------------- .../Controller/SecuredController.php | 2 - 6 files changed, 46 insertions(+), 429 deletions(-) diff --git a/README.md b/README.md index ebc507e7e5..304adb0609 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 diff --git a/app/AppKernel.php b/app/AppKernel.php index a19c9c183d..c5c9eb6b2f 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -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'))) { diff --git a/app/config/security.yml b/app/config/security.yml index 0b74597f31..243aa71b44 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,7 +1,3 @@ -jms_security_extra: - secure_all_services: false - expressions: true - security: encoders: Symfony\Component\Security\Core\User\User: plaintext @@ -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 } diff --git a/composer.json b/composer.json index 30a7fe65df..bba8fad81c 100644 --- a/composer.json +++ b/composer.json @@ -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": [ diff --git a/composer.lock b/composer.lock index 8c6ff1b418..75f5fcab29 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "9e7658e914f406cea1c940fca27fbd14", + "hash": "d3866f14011bee6cf31303acde07596a", "packages": [ { "name": "doctrine/annotations", @@ -353,12 +353,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "v1.2.0" + "reference": "80a7198c470d74755db64aa3f75898f3808778b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/v1.2.0", - "reference": "v1.2.0", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/80a7198c470d74755db64aa3f75898f3808778b7", + "reference": "80a7198c470d74755db64aa3f75898f3808778b7", "shasum": "" }, "require": { @@ -414,7 +414,7 @@ "orm", "persistence" ], - "time": "2013-03-25 20:13:59" + "time": "2013-04-30 09:04:17" }, { "name": "doctrine/inflector", @@ -617,12 +617,12 @@ "source": { "type": "git", "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "e38ea8a0cbd943ac78014d07f42441cd51d537db" + "reference": "v1.2.9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/e38ea8a0cbd943ac78014d07f42441cd51d537db", - "reference": "e38ea8a0cbd943ac78014d07f42441cd51d537db", + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/v1.2.9", + "reference": "v1.2.9", "shasum": "" }, "require": { @@ -644,7 +644,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -659,327 +659,7 @@ "highlight", "sql" ], - "time": "2013-03-31 22:29:24" - }, - { - "name": "jms/aop-bundle", - "version": "dev-master", - "target-dir": "JMS/AopBundle", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/JMSAopBundle.git", - "reference": "7018357f5bedf204979a88867a9da05973744422" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSAopBundle/zipball/7018357f5bedf204979a88867a9da05973744422", - "reference": "7018357f5bedf204979a88867a9da05973744422", - "shasum": "" - }, - "require": { - "jms/cg": "1.*", - "symfony/framework-bundle": "2.*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\AopBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Adds AOP capabilities to Symfony2", - "keywords": [ - "annotations", - "aop" - ], - "time": "2013-01-09 08:03:40" - }, - { - "name": "jms/cg", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/cg-library.git", - "reference": "75a519d83a33f6b893a25aef835a1e5fc166a6d7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/cg-library/zipball/75a519d83a33f6b893a25aef835a1e5fc166a6d7", - "reference": "75a519d83a33f6b893a25aef835a1e5fc166a6d7", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "CG\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Toolset for generating PHP code", - "keywords": [ - "code generation" - ], - "time": "2013-03-23 08:03:00" - }, - { - "name": "jms/di-extra-bundle", - "version": "dev-master", - "target-dir": "JMS/DiExtraBundle", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git", - "reference": "a15367768d8bbf0b5eac135adf31880ed99cc12d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/a15367768d8bbf0b5eac135adf31880ed99cc12d", - "reference": "a15367768d8bbf0b5eac135adf31880ed99cc12d", - "shasum": "" - }, - "require": { - "jms/aop-bundle": ">=1.0.0,<1.2-dev", - "jms/metadata": "1.*", - "symfony/finder": ">=2.1,<3.0", - "symfony/framework-bundle": ">=2.1,<3.0", - "symfony/process": ">=2.1,<3.0" - }, - "require-dev": { - "doctrine/doctrine-bundle": "*", - "doctrine/orm": "*", - "jms/security-extra-bundle": "1.*", - "phpcollection/phpcollection": ">=0.1,<0.3-dev", - "sensio/framework-extra-bundle": "*", - "symfony/browser-kit": "*", - "symfony/class-loader": "*", - "symfony/form": "*", - "symfony/security-bundle": "*", - "symfony/twig-bundle": "*", - "symfony/validator": "*", - "symfony/yaml": "*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\DiExtraBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Allows to configure dependency injection using annotations", - "homepage": "http://jmsyst.com/bundles/JMSDiExtraBundle", - "keywords": [ - "annotations", - "dependency injection" - ], - "time": "2013-03-21 16:34:41" - }, - { - "name": "jms/metadata", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/metadata.git", - "reference": "0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e", - "reference": "0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "doctrine/common": ">=2.0,<2.4-dev" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "Metadata\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Class/method/property metadata management in PHP", - "keywords": [ - "annotations", - "metadata", - "xml", - "yaml" - ], - "time": "2013-03-28 16:32:37" - }, - { - "name": "jms/parser-lib", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/parser-lib.git", - "reference": "4d469a70c6dd03f921cbdeadafbcb261bb23e8b0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/4d469a70c6dd03f921cbdeadafbcb261bb23e8b0", - "reference": "4d469a70c6dd03f921cbdeadafbcb261bb23e8b0", - "shasum": "" - }, - "require": { - "phpoption/phpoption": ">=0.9,<2.0-dev" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "description": "A library for easily creating recursive-descent parsers.", - "time": "2012-11-30 08:11:04" - }, - { - "name": "jms/security-extra-bundle", - "version": "dev-master", - "target-dir": "JMS/SecurityExtraBundle", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git", - "reference": "f2a345dc468eb0ba9ce50211b289422c82082db0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/f2a345dc468eb0ba9ce50211b289422c82082db0", - "reference": "f2a345dc468eb0ba9ce50211b289422c82082db0", - "shasum": "" - }, - "require": { - "jms/aop-bundle": ">=1.0.0,<1.2-dev", - "jms/di-extra-bundle": "1.3.*", - "jms/metadata": "1.*", - "jms/parser-lib": "1.*", - "symfony/framework-bundle": ">=2.1,<3.0", - "symfony/security-bundle": "*" - }, - "require-dev": { - "doctrine/doctrine-bundle": "*", - "doctrine/orm": "*", - "sensio/framework-extra-bundle": "*", - "symfony/browser-kit": "*", - "symfony/class-loader": "*", - "symfony/css-selector": "*", - "symfony/finder": "*", - "symfony/form": "*", - "symfony/process": "*", - "symfony/twig-bundle": "*", - "symfony/validator": "*", - "symfony/yaml": "*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-0": { - "JMS\\SecurityExtraBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Enhances the Symfony2 Security Component by adding several new features", - "homepage": "http://jmsyst.com/bundles/JMSSecurityExtraBundle", - "keywords": [ - "annotations", - "authorization", - "expression", - "secure", - "security" - ], - "time": "2013-03-21 13:05:31" + "time": "2013-04-26 18:42:52" }, { "name": "kriswallsmith/assetic", @@ -987,12 +667,12 @@ "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371" + "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/0a55a9ba70bd9250899ad77deceaf8cb9e145371", - "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/1b17f9a239276f24344f9f7d7be8293f6dca4e19", + "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19", "shasum": "" }, "require": { @@ -1050,20 +730,20 @@ "compression", "minification" ], - "time": "2013-04-02 21:36:28" + "time": "2013-04-27 14:32:20" }, { "name": "monolog/monolog", - "version": "1.5.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1.5.0" + "reference": "b264026cba83b4f02ebea7d908a6340a9fd010ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.5.0", - "reference": "1.5.0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b264026cba83b4f02ebea7d908a6340a9fd010ac", + "reference": "b264026cba83b4f02ebea7d908a6340a9fd010ac", "shasum": "" }, "require": { @@ -1085,7 +765,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -1112,56 +792,7 @@ "logging", "psr-3" ], - "time": "2013-04-23 10:09:48" - }, - { - "name": "phpoption/phpoption", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/php-option.git", - "reference": "e686c0d55c87e042dec9c7fe3fa86b2b3b9d9ee3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e686c0d55c87e042dec9c7fe3fa86b2b3b9d9ee3", - "reference": "e686c0d55c87e042dec9c7fe3fa86b2b3b9d9ee3", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-0": { - "PhpOption\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Option Type for PHP", - "keywords": [ - "language", - "option", - "php", - "type" - ], - "time": "2013-03-28 16:34:57" + "time": "2013-04-24 15:45:58" }, { "name": "psr/log", @@ -1348,12 +979,12 @@ "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "e77eb358a1aa7157afb922f33e2afc22f6a7bef2" + "reference": "a64528efec37173a6dabaedb0e678beffdb446f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/e77eb358a1aa7157afb922f33e2afc22f6a7bef2", - "reference": "e77eb358a1aa7157afb922f33e2afc22f6a7bef2", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/a64528efec37173a6dabaedb0e678beffdb446f0", + "reference": "a64528efec37173a6dabaedb0e678beffdb446f0", "shasum": "" }, "require": { @@ -1362,7 +993,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1372,7 +1003,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -1389,7 +1020,7 @@ "mail", "mailer" ], - "time": "2013-04-11 10:22:54" + "time": "2013-04-30 17:36:15" }, { "name": "symfony/assetic-bundle", @@ -1509,12 +1140,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle.git", - "reference": "1fc0864a9344b15a04ed90612a91cf8e5b8fb305" + "reference": "a165416edd8d8ada8a174dfeec11550e9a491792" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/1fc0864a9344b15a04ed90612a91cf8e5b8fb305", - "reference": "1fc0864a9344b15a04ed90612a91cf8e5b8fb305", + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/a165416edd8d8ada8a174dfeec11550e9a491792", + "reference": "a165416edd8d8ada8a174dfeec11550e9a491792", "shasum": "" }, "require": { @@ -1558,7 +1189,7 @@ "log", "logging" ], - "time": "2013-04-22 16:41:38" + "time": "2013-04-24 12:34:02" }, { "name": "symfony/swiftmailer-bundle", @@ -1621,12 +1252,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "756d51929ebe5aa14e9d9eec0ddcf3918a795b43" + "reference": "4dcee0a528458a60f50892ba531b48933dec3bbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/756d51929ebe5aa14e9d9eec0ddcf3918a795b43", - "reference": "756d51929ebe5aa14e9d9eec0ddcf3918a795b43", + "url": "https://api.github.com/repos/symfony/symfony/zipball/4dcee0a528458a60f50892ba531b48933dec3bbe", + "reference": "4dcee0a528458a60f50892ba531b48933dec3bbe", "shasum": "" }, "require": { @@ -1678,6 +1309,7 @@ "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": ">=2.2,<3.0", "doctrine/orm": ">=2.2,<3.0,>=2.2.3", + "ircmaxell/password-compat": "1.0.*", "monolog/monolog": ">=1.3,<2.0", "propel/propel1": "1.6.*" }, @@ -1718,7 +1350,7 @@ "keywords": [ "framework" ], - "time": "2013-04-24 09:28:15" + "time": "2013-04-30 17:23:11" }, { "name": "twig/extensions", @@ -1773,12 +1405,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "80fd11cbbe68fada461626e7b2d67bda0ef8ecfa" + "reference": "536ea37d1f87a882ce8a5d62680caf881ecaf6fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/80fd11cbbe68fada461626e7b2d67bda0ef8ecfa", - "reference": "80fd11cbbe68fada461626e7b2d67bda0ef8ecfa", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/536ea37d1f87a882ce8a5d62680caf881ecaf6fe", + "reference": "536ea37d1f87a882ce8a5d62680caf881ecaf6fe", "shasum": "" }, "require": { @@ -1814,7 +1446,7 @@ "keywords": [ "templating" ], - "time": "2013-04-17 12:07:50" + "time": "2013-04-26 09:34:36" } ], "packages-dev": [ diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php index 9848e42977..63ff42bfdd 100644 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -6,7 +6,6 @@ use Symfony\Component\Security\Core\SecurityContext; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use JMS\SecurityExtraBundle\Annotation\Secure; /** * @Route("/demo/secured") @@ -59,7 +58,6 @@ public function helloAction($name) /** * @Route("/hello/admin/{name}", name="_demo_secured_hello_admin") - * @Secure(roles="ROLE_ADMIN") * @Template() */ public function helloadminAction($name)