From c76487ee04228f2dae0dc32b3d356911bb3cc906 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Nov 2011 17:46:50 +0100 Subject: [PATCH 1/3] Fix composer.json files to be stricter --- src/Symfony/Bridge/Doctrine/composer.json | 4 ++-- src/Symfony/Bridge/Monolog/composer.json | 4 ++-- src/Symfony/Bridge/Swiftmailer/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 8 ++++---- src/Symfony/Bundle/DoctrineBundle/composer.json | 8 ++++---- .../Bundle/FrameworkBundle/composer.json | 17 +++++++++-------- src/Symfony/Bundle/MonologBundle/composer.json | 2 +- src/Symfony/Bundle/SecurityBundle/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/BrowserKit/composer.json | 4 ++-- .../Component/DependencyInjection/composer.json | 4 ++-- src/Symfony/Component/DomCrawler/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 8 ++++---- src/Symfony/Component/HttpKernel/composer.json | 16 ++++++++-------- src/Symfony/Component/Routing/composer.json | 4 ++-- src/Symfony/Component/Security/composer.json | 14 +++++++------- src/Symfony/Component/Translation/composer.json | 4 ++-- src/Symfony/Component/Validator/composer.json | 4 ++-- 19 files changed, 56 insertions(+), 55 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 56708719b2..21b990809f 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -24,8 +24,8 @@ "doctrine/orm": ">=2.1" }, "suggest": { - "symfony/form": ">=2.0", - "symfony/validator": ">=2.0" + "symfony/form": "self.version", + "symfony/validator": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Doctrine": "" } diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 86c0cf29e7..afd731e92d 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -18,8 +18,8 @@ ], "require": { "php": ">=5.3.2", - "symfony/http-kernel": ">=2.0", - "monolog/monolog": ">=1.0" + "symfony/http-kernel": "self.version", + "monolog/monolog": "1.*" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Monolog": "" } diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index 05aa5a29e7..5de34cdd84 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -21,7 +21,7 @@ "swiftmailer/swiftmailer": ">=4.1" }, "suggest": { - "symfony/http-kernel": ">=2.0" + "symfony/http-kernel": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" } diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 58530554cc..d695be02fe 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -21,10 +21,10 @@ "twig/twig": ">=1.1" }, "suggest": { - "symfony/form": ">=2.0", - "symfony/routing": ">=2.0", - "symfony/translation": ">=2.0", - "symfony/yaml": ">=2.0" + "symfony/form": "self.version", + "symfony/routing": "self.version", + "symfony/translation": "self.version", + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } diff --git a/src/Symfony/Bundle/DoctrineBundle/composer.json b/src/Symfony/Bundle/DoctrineBundle/composer.json index e19dc1dc16..ae0a32dd67 100644 --- a/src/Symfony/Bundle/DoctrineBundle/composer.json +++ b/src/Symfony/Bundle/DoctrineBundle/composer.json @@ -18,12 +18,12 @@ ], "require": { "php": ">=5.3.2", - "symfony/doctrine-bridge": ">=2.0", - "symfony/doctrine-abstract-bundle": ">=2.0" + "symfony/doctrine-bridge": "2.*", + "symfony/doctrine-abstract-bundle": "2.*" }, "recommend": { - "doctrine/dbal": ">=2.0", - "doctrine/orm": ">=2.0" + "doctrine/dbal": "2.*", + "doctrine/orm": "2.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\DoctrineBundle": "" } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 11d450773f..71c6790978 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -18,16 +18,17 @@ ], "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.0", - "symfony/http-kernel": ">=2.0", - "symfony/routing": ">=2.0", - "symfony/templating": ">=2.0", - "symfony/translation": ">=2.0" + "symfony/event-dispatcher": "self.version", + "symfony/http-kernel": "self.version", + "symfony/routing": "self.version", + "symfony/templating": "self.version", + "symfony/translator": "self.version", + "doctrine/common": ">=2.2.0-dev" }, "recommend": { - "symfony/console": ">=2.0", - "symfony/form": ">=2.0", - "symfony/validator": ">=2.0" + "symfony/console": "self.version", + "symfony/form": "self.version", + "symfony/validator": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" } diff --git a/src/Symfony/Bundle/MonologBundle/composer.json b/src/Symfony/Bundle/MonologBundle/composer.json index 8259b92de1..0eee5aea85 100644 --- a/src/Symfony/Bundle/MonologBundle/composer.json +++ b/src/Symfony/Bundle/MonologBundle/composer.json @@ -19,7 +19,7 @@ "require": { "php": ">=5.3.2", "monolog/monolog": ">=1.0", - "symfony/monolog-bridge": ">=2.0" + "symfony/monolog-bridge": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bundle\\MonologBundle": "" } diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 1dc166de09..5ea3d138df 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=5.3.2", - "symfony/security": ">=2.0" + "symfony/security": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bundle\\SecurityBundle": "" } diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index f1e1f57ed4..178254d909 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -19,7 +19,7 @@ "require": { "php": ">=5.3.2", "twig/twig": ">=1.1", - "symfony/twig-bridge": ">=2.0" + "symfony/twig-bridge": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bundle\\TwigBundle": "" } diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index e5dbd5c546..5805c7ca85 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=5.3.2", - "symfony/twig-bundle": ">=2.0" + "symfony/twig-bundle": "self.version" }, "autoload": { "psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" } diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index d0a1838482..f6582a3b3a 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -18,10 +18,10 @@ ], "require": { "php": ">=5.3.2", - "symfony/dom-crawler": ">=2.0" + "symfony/dom-crawler": "self.version" }, "suggest": { - "symfony/process": ">=2.0" + "symfony/process": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\BrowserKit": "" } diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 43ffacb7eb..4795adda9c 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -20,10 +20,10 @@ "php": ">=5.3.2" }, "recommend": { - "symfony/config": ">=2.0" + "symfony/config": "self.version" }, "suggest": { - "symfony/yaml": ">=2.0" + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\DependencyInjection": "" } diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index ea5a8137c7..2fbe52e674 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -20,7 +20,7 @@ "php": ">=5.3.2" }, "suggest": { - "symfony/css-selector": ">=2.0" + "symfony/css-selector": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\DomCrawler": "" } diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 9d565ecd5e..c98632f79e 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -18,12 +18,12 @@ ], "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.0", - "symfony/locale": ">=2.0", - "symfony/validator": ">=2.0" + "symfony/event-dispatcher": "self.version", + "symfony/locale": "self.version", + "symfony/validator": "self.version" }, "suggest": { - "symfony/http-foundation": ">=2.0" + "symfony/http-foundation": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\Form": "" } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index ad2e08acaf..4251d500ce 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -18,16 +18,16 @@ ], "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.0", - "symfony/http-foundation": ">=2.0" + "symfony/event-dispatcher": "self.version", + "symfony/http-foundation": "self.version" }, "suggest": { - "symfony/browser-kit": ">=2.0", - "symfony/class-loader": ">=2.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/dependency-injection": ">=2.0", - "symfony/finder": ">=2.0" + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/finder": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel": "" } diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 30864aa6d6..76f6a090da 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -20,8 +20,8 @@ "php": ">=5.3.2" }, "suggest": { - "symfony/config": ">=2.0", - "symfony/yaml": ">=2.0" + "symfony/config": "self.version", + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\Routing": "" } diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index f75a776b07..34bd1dda43 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -18,15 +18,15 @@ ], "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.0", - "symfony/http-foundation": ">=2.0", - "symfony/http-kernel": ">=2.0" + "symfony/event-dispatcher": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version" }, "suggest": { - "symfony/class-loader": ">=2.0", - "symfony/finder": ">=2.0", - "symfony/form": ">=2.0", - "symfony/routing": ">=2.0" + "symfony/class-loader": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/routing": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\Security": "" } diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index fb24fb6820..e8e3fe5701 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -20,8 +20,8 @@ "php": ">=5.3.2" }, "suggest": { - "symfony/config": ">=2.0", - "symfony/yaml": ">=2.0" + "symfony/config": "self.version", + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\Translation": "" } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 6519e40bb7..7e2591bca7 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -21,8 +21,8 @@ "doctrine/common": ">=2.1" }, "suggest": { - "symfony/http-foundation": ">=2.0", - "symfony/yaml": ">=2.0" + "symfony/http-foundation": "self.version", + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony\\Component\\Validator": "" } From a250e3d2a00370646e60b3dc47042cf3b9354d8c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Nov 2011 18:02:40 +0100 Subject: [PATCH 2/3] Update root package versions --- composer.json | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index cc6fd9f8af..5273b3643e 100644 --- a/composer.json +++ b/composer.json @@ -20,38 +20,38 @@ "php": ">=5.3.2" }, "replace": { - "symfony/doctrine-bridge": ">=2.0", - "symfony/monolog-bridge": ">=2.0", - "symfony/twig-bridge": ">=2.0", - "symfony/doctrine-abstract-bundle": ">=2.0", - "symfony/doctrine-bundle": ">=2.0", - "symfony/framework-bundle": ">=2.0", - "symfony/monolog-bundle": ">=2.0", - "symfony/security-bundle": ">=2.0", - "symfony/swiftmailer-bundle": ">=2.0", - "symfony/twig-bundle": ">=2.0", - "symfony/web-profiler-bundle": ">=2.0", - "symfony/browser-kit": ">=2.0", - "symfony/class-loader": ">=2.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/css-selector": ">=2.0", - "symfony/dependency-injection": ">=2.0", - "symfony/dom-crawler": ">=2.0", - "symfony/event-dispatcher": ">=2.0", - "symfony/finder": ">=2.0", - "symfony/form": ">=2.0", - "symfony/http-foundation": ">=2.0", - "symfony/http-kernel": ">=2.0", - "symfony/locale": ">=2.0", - "symfony/process": ">=2.0", - "symfony/routing": ">=2.0", - "symfony/security": ">=2.0", - "symfony/serializer": ">=2.0", - "symfony/templating": ">=2.0", - "symfony/translation": ">=2.0", - "symfony/validator": ">=2.0", - "symfony/yaml": ">=2.0" + "symfony/doctrine-bridge": "self.version", + "symfony/monolog-bridge": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/doctrine-abstract-bundle": "self.version", + "symfony/doctrine-bundle": "self.version", + "symfony/framework-bundle": "self.version", + "symfony/monolog-bundle": "self.version", + "symfony/security-bundle": "self.version", + "symfony/swiftmailer-bundle": "self.version", + "symfony/twig-bundle": "self.version", + "symfony/web-profiler-bundle": "self.version", + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/css-selector": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/dom-crawler": "self.version", + "symfony/event-dispatcher": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version", + "symfony/locale": "self.version", + "symfony/process": "self.version", + "symfony/routing": "self.version", + "symfony/security": "self.version", + "symfony/serializer": "self.version", + "symfony/templating": "self.version", + "symfony/translation": "self.version", + "symfony/validator": "self.version", + "symfony/yaml": "self.version" }, "autoload": { "psr-0": { "Symfony": "src/" } From ca974f5b4d8a2167c12d82b28806624402e4f543 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Nov 2011 18:24:40 +0100 Subject: [PATCH 3/3] Fix doctrine requirement --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 71c6790978..b94770921c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -23,7 +23,7 @@ "symfony/routing": "self.version", "symfony/templating": "self.version", "symfony/translator": "self.version", - "doctrine/common": ">=2.2.0-dev" + "doctrine/common": ">=2.1.0" }, "recommend": { "symfony/console": "self.version",