merged branch hason/composer_2_1 (PR #6201)

This PR was merged into the 2.1 branch. Commits ------- 10e5f3b Removed useless branch alias for dev-master in composer.json Discussion ---------- [2.1] Fixed composer.json --------------------------------------------------------------------------- by fabpot at 2012-12-06T08:23:35Z Why is is useless? --------------------------------------------------------------------------- by hason at 2012-12-06T08:30:58Z Because the ``dev-master`` branch is alias for ``2.2-dev`` as mentioned @stof in https://github.com/symfony/symfony/pull/6196#discussion_r2320254. --------------------------------------------------------------------------- by fabpot at 2012-12-06T08:33:42Z got it now. Can you fix your PR as there are some unrelated commits? Thanks. --------------------------------------------------------------------------- by hason at 2012-12-06T09:02:50Z I backported some "unrelated" commits for better usage with composer. Should I remove these? --------------------------------------------------------------------------- by fabpot at 2012-12-06T09:05:45Z We do not backport things. So, please, remove them. --------------------------------------------------------------------------- by hason at 2012-12-06T10:02:08Z done
2012-12-06 11:19:11 +01:00 · 2012-12-06 11:19:11 +01:00 · 101f0421ca
commit 101f0421ca
parent 889bd2ee62 10e5f3b3df
33 changed files with 33 additions and 198 deletions
--- a/composer.json
+++ b/composer.json
@ -67,10 +67,5 @@
            "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs"
        }
    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@ -30,10 +30,5 @@
        "psr-0": { "Symfony\\Bridge\\Doctrine": "" }
    },
    "target-dir": "Symfony/Bridge/Doctrine",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@ -24,10 +24,5 @@
        "psr-0": { "Symfony\\Bridge\\Monolog": "" }
    },
    "target-dir": "Symfony/Bridge/Monolog",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bridge/Propel1/composer.json
+++ b/src/Symfony/Bridge/Propel1/composer.json
@ -26,10 +26,5 @@
        "psr-0": { "Symfony\\Bridge\\Propel1": "" }
    },
    "target-dir": "Symfony/Bridge/Propel1",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bridge/Swiftmailer/composer.json
+++ b/src/Symfony/Bridge/Swiftmailer/composer.json
@ -26,10 +26,5 @@
        "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" }
    },
    "target-dir": "Symfony/Bridge/Swiftmailer",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@ -39,10 +39,5 @@
        "psr-0": { "Symfony\\Bridge\\Twig": "" }
    },
    "target-dir": "Symfony/Bridge/Twig",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@ -40,10 +40,5 @@
        "psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" }
    },
    "target-dir": "Symfony/Bundle/FrameworkBundle",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@ -23,10 +23,5 @@
        "psr-0": { "Symfony\\Bundle\\SecurityBundle": "" }
    },
    "target-dir": "Symfony/Bundle/SecurityBundle",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@ -23,10 +23,5 @@
        "psr-0": { "Symfony\\Bundle\\TwigBundle": "" }
    },
    "target-dir": "Symfony/Bundle/TwigBundle",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@ -23,10 +23,5 @@
        "psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" }
    },
    "target-dir": "Symfony/Bundle/WebProfilerBundle",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/BrowserKit/composer.json
+++ b/src/Symfony/Component/BrowserKit/composer.json
@ -30,10 +30,5 @@
        "psr-0": { "Symfony\\Component\\BrowserKit": "" }
    },
    "target-dir": "Symfony/Component/BrowserKit",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/ClassLoader/composer.json
+++ b/src/Symfony/Component/ClassLoader/composer.json
@ -26,10 +26,5 @@
        "psr-0": { "Symfony\\Component\\ClassLoader": "" }
    },
    "target-dir": "Symfony/Component/ClassLoader",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Config": "" }
    },
    "target-dir": "Symfony/Component/Config",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Console": "" }
    },
    "target-dir": "Symfony/Component/Console",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/CssSelector/composer.json
+++ b/src/Symfony/Component/CssSelector/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\CssSelector": "" }
    },
    "target-dir": "Symfony/Component/CssSelector",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@ -30,10 +30,5 @@
        "psr-0": { "Symfony\\Component\\DependencyInjection": "" }
    },
    "target-dir": "Symfony/Component/DependencyInjection",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/DomCrawler/composer.json
+++ b/src/Symfony/Component/DomCrawler/composer.json
@ -28,10 +28,5 @@
        "psr-0": { "Symfony\\Component\\DomCrawler": "" }
    },
    "target-dir": "Symfony/Component/DomCrawler",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@ -29,10 +29,5 @@
        "psr-0": { "Symfony\\Component\\EventDispatcher": "" }
    },
    "target-dir": "Symfony/Component/EventDispatcher",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Filesystem/composer.json
+++ b/src/Symfony/Component/Filesystem/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Filesystem": "" }
    },
    "target-dir": "Symfony/Component/Filesystem",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Finder/composer.json
+++ b/src/Symfony/Component/Finder/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Finder": "" }
    },
    "target-dir": "Symfony/Component/Finder",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@ -33,10 +33,5 @@
        "psr-0": { "Symfony\\Component\\Form": "" }
    },
    "target-dir": "Symfony/Component/Form",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@ -25,10 +25,5 @@
        }
    },
    "target-dir": "Symfony/Component/HttpFoundation",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@ -42,10 +42,5 @@
        "psr-0": { "Symfony\\Component\\HttpKernel": "" }
    },
    "target-dir": "Symfony/Component/HttpKernel",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Locale/composer.json
+++ b/src/Symfony/Component/Locale/composer.json
@ -25,10 +25,5 @@
        "psr-0": { "Symfony\\Component\\Locale": "" }
    },
    "target-dir": "Symfony/Component/Locale",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/OptionsResolver/composer.json
+++ b/src/Symfony/Component/OptionsResolver/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\OptionsResolver": "" }
    },
    "target-dir": "Symfony/Component/OptionsResolver",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Process/composer.json
+++ b/src/Symfony/Component/Process/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Process": "" }
    },
    "target-dir": "Symfony/Component/Process",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@ -33,10 +33,5 @@
        "psr-0": { "Symfony\\Component\\Routing": "" }
    },
    "target-dir": "Symfony/Component/Routing",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@ -40,10 +40,5 @@
        "psr-0": { "Symfony\\Component\\Security": "" }
    },
    "target-dir": "Symfony/Component/Security",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Serializer": "" }
    },
    "target-dir": "Symfony/Component/Serializer",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Templating/composer.json
+++ b/src/Symfony/Component/Templating/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Templating": "" }
    },
    "target-dir": "Symfony/Component/Templating",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@ -30,10 +30,5 @@
        "psr-0": { "Symfony\\Component\\Translation": "" }
    },
    "target-dir": "Symfony/Component/Translation",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@ -32,10 +32,5 @@
        "psr-0": { "Symfony\\Component\\Validator": "" }
    },
    "target-dir": "Symfony/Component/Validator",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
--- a/src/Symfony/Component/Yaml/composer.json
+++ b/src/Symfony/Component/Yaml/composer.json
@ -22,10 +22,5 @@
        "psr-0": { "Symfony\\Component\\Yaml": "" }
    },
    "target-dir": "Symfony/Component/Yaml",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }