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
This commit is contained in:
commit
101f0421ca
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -25,10 +25,5 @@
|
||||
}
|
||||
},
|
||||
"target-dir": "Symfony/Component/HttpFoundation",
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.1-dev"
|
||||
}
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
Reference in New Issue
Block a user