Browse Source

merged branch Seldaek/composerfix3 (PR #2704)

Commits
-------

ca974f5 Fix doctrine requirement
a250e3d Update root package versions
c76487e Fix composer.json files to be stricter

Discussion
----------

Fix composer.json files to be stricter
Fabien Potencier 13 years ago
parent
commit
29bc4157d3

+ 32 - 32
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/" }

+ 2 - 2
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": "" }

+ 2 - 2
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": "" }

+ 1 - 1
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": "" }

+ 4 - 4
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": "" }

+ 4 - 4
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": "" }

+ 9 - 8
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.1.0"
     },
     "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": "" }

+ 1 - 1
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": "" }

+ 1 - 1
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": "" }

+ 1 - 1
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": "" }

+ 1 - 1
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": "" }

+ 2 - 2
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": "" }

+ 2 - 2
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": "" }

+ 1 - 1
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": "" }

+ 4 - 4
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": "" }

+ 8 - 8
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": "" }

+ 2 - 2
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": "" }

+ 7 - 7
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": "" }

+ 2 - 2
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": "" }

+ 2 - 2
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": "" }