8000 merged branch hason/composer_2_1 (PR #6201) · symfony/symfony@101f042 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 101f042

Browse files
fabpotfabpot
committed
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 #6196 (comment). --------------------------------------------------------------------------- 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
2 parents 889bd2e + 10e5f3b commit 101f042

File tree

33 files changed

+33
-198
lines changed

33 files changed

+33
-198
lines changed

‎composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,5 @@
6767
"SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs"
6868
}
6969
},
70-
"minimum-stability": "dev",
71-
"extra": {
72-
"branch-alias": {
73-
"dev-master": "2.1-dev"
74-
}
75-
}
70+
"minimum-stability": "dev"
7671
}

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,5 @@
3030
"psr-0": { "Symfony\\Bridge\\Doctrine": "" }
3131
},
3232
"target-dir": "Symfony/Bridge/Doctrine",
33-
"minimum-stability": "dev",
34-
"extra": {
35-
"branch-alias": {
36-
"dev-master": "2.1-dev"
37-
}
38-
}
33+
"minimum-stability": "dev"
3934
}

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,5 @@
2424
"psr-0": { "Symfony\\Bridge\\Monolog": "" }
2525
},
2626
"target-dir": "Symfony/Bridge/Monolog",
27-
"minimum-stability": "dev",
28-
"extra": {
29-
"branch-alias": {
30-
"dev-master": "2.1-dev"
31-
}
32-
}
27+
"minimum-stability": "dev"
3328
}

‎src/Symfony/Bridge/Propel1/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,5 @@
2626
"psr-0": { "Symfony\\Bridge\\Propel1": "" }
2727
},
2828
"target-dir": "Symfony/Bridge/Propel1",
29-
"minimum-stability": "dev",
30-
"extra": {
31-
"branch-alias": {
32-
"dev-master": "2.1-dev"
33-
}
34-
}
29+
"minimum-stability": "dev"
3530
}

‎src/Symfony/Bridge/Swiftmailer/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,5 @@
2626
"psr-0": { "Symfony\\Bridge\\Swiftmailer": "" }
2727
},
2828
"target-dir": "Symfony/Bridge/Swiftmailer",
29-
"minimum-stability": "dev",
30-
"extra": {
31-
"branch-alias": {
32-
"dev-master": "2.1-dev"
33-
}
34-
}
29+
"minimum-stability": "dev"
3530
}

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,5 @@
3939
"psr-0": { "Symfony\\Bridge\\Twig": "" }
4040
},
4141
"target-dir": "Symfony/Bridge/Twig",
42-
"minimum-stability": "dev",
43-
"extra": {
44-
"branch-alias": {
45-
"dev-master": "2.1-dev"
46-
}
47-
}
42+
"minimum-stability": "dev"
4843
}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,5 @@
4040
"psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" }
4141
},
4242
"target-dir": "Symfony/Bundle/FrameworkBundle",
43-
"minimum-stability": "dev",
44-
"extra": {
45-
"branch-alias": {
46-
"dev-master": "2.1-dev"
47-
}
48-
}
43+
"minimum-stability": "dev"
4944
}

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,5 @@
2323
"psr-0": { "Symfony\\Bundle\\SecurityBundle": "" }
2424
},
2525
"target-dir": "Symfony/Bundle/SecurityBundle",
26-
"minimum-stability": "dev",
27-
"extra": {
28-
"branch-alias": {
29-
"dev-master": "2.1-dev"
30-
}
31-
}
26+
"minimum-stability": "dev"
3227
}

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,5 @@
2323
"psr-0": { "Symfony\\Bundle\\TwigBundle": "" }
2424
},
2525
"target-dir": "Symfony/Bundle/TwigBundle",
26-
"minimum-stability": "dev",
27-
"extra": {
28-
"branch-alias": {
29-
"dev-master": "2.1-dev"
30-
}
31-
}
26+
"minimum-stability": "dev"
3227
}

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,5 @@
2323
"psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" }
2424
},
2525
"target-dir": "Symfony/Bundle/WebProfilerBundle",
26-
"minimum-stability": "dev",
27-
"extra": {
28-
"branch-alias": {
29-
"dev-master": "2.1-dev"
30-
}
31-
}
26+
"minimum-stability": "dev"
3227
}

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,5 @@
3030
"psr-0": { "Symfony\\Component\\BrowserKit": "" }
3131
},
3232
"target-dir": "Symfony/Component/BrowserKit",
33-
"minimum-stability": "dev",
34-
"extra": {
35-
"branch-alias": {
36-
"dev-master": "2.1-dev"
37-
}
38-
}
33+
"minimum-stability": "dev"
3934
}

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,5 @@
2626
"psr-0": { "Symfony\\Component\\ClassLoader": "" }
2727
},
2828
"target-dir": "Symfony/Component/ClassLoader",
29-
"minimum-stability": "dev",
30-
"extra": {
31-
"branch-alias": {
32-
"dev-master": "2.1-dev"
33-
}
34-
}
29+
"minimum-stability": "dev"
3530
}

‎src/Symfony/Component/Config/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Config": "" }
2323
},
2424
"target-dir": "Symfony/Component/Config",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Console": "" }
2323
},
2424
"target-dir": "Symfony/Component/Console",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/CssSelector/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\CssSelector": "" }
2323
},
2424
"target-dir": "Symfony/Component/CssSelector",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,5 @@
3030
"psr-0": { "Symfony\\Component\\DependencyInjection": "" }
3131
},
3232
"target-dir": "Symfony/Component/DependencyInjection",
33-
"minimum-stability": "dev",
34-
"extra": {
35-
"branch-alias": {
36-
"dev-master": "2.1-dev"
37-
}
38-
}
33+
"minimum-stability": "dev"
3934
}

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,5 @@
2828
"psr-0": { "Symfony\\Component\\DomCrawler": "" }
2929
},
3030
"target-dir": "Symfony/Component/DomCrawler",
31-
"minimum-stability": "dev",
32-
"extra": {
33-
"branch-alias": {
34-
"dev-master": "2.1-dev"
35-
}
36-
}
31+
"minimum-stability": "dev"
3732
}

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,5 @@
2929
"psr-0": { "Symfony\\Component\\EventDispatcher": "" }
3030
},
3131
"target-dir": "Symfony/Component/EventDispatcher",
32-
"minimum-stability": "dev",
33-
"extra": {
34-
"branch-alias": {
35-
"dev-master": "2.1-dev"
36-
}
37-
}
32+
"minimum-stability": "dev"
3833
}

‎src/Symfony/Component/Filesystem/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Filesystem": "" }
2323
},
2424
"target-dir": "Symfony/Component/Filesystem",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Finder/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Finder": "" }
2323
},
2424
"target-dir": "Symfony/Component/Finder",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,5 @@
3333
"psr-0": { "Symfony\\Component\\Form": "" }
3434
},
3535
"target-dir": "Symfony/Component/Form",
36-
"minimum-stability": "dev",
37-
"extra": {
38-
"branch-alias": {
39-
"dev-master": "2.1-dev"
40-
}
41-
}
36+
"minimum-stability": "dev"
4237
}

‎src/Symfony/Component/HttpFoundation/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,5 @@
2525
}
2626
},
2727
"target-dir": "Symfony/Component/HttpFoundation",
28-
"minimum-stability": "dev",
29-
"extra": {
30-
"branch-alias": {
31-
"dev-master": "2.1-dev"
32-
}
33-
}
28+
"minimum-stability": "dev"
3429
}

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,5 @@
4242
"psr-0": { "Symfony\\Component\\HttpKernel": "" }
4343
},
4444
"target-dir": "Symfony/Component/HttpKernel",
45-
"minimum-stability": "dev",
46-
"extra": {
47-
"branch-alias": {
48-
"dev-master": "2.1-dev"
49-
}
50-
}
45+
"minimum-stability": "dev"
5146
}

‎src/Symfony/Component/Locale/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,5 @@
2525
"psr-0": { "Symfony\\Component\\Locale": "" }
2626
},
2727
"target-dir": "Symfony/Component/Locale",
28-
"minimum-stability": "dev",
29-
"extra": {
30-
"branch-alias": {
31-
"dev-master": "2.1-dev"
32-
}
33-
}
28+
"minimum-stability": "dev"
3429
}

‎src/Symfony/Component/OptionsResolver/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\OptionsResolver": "" }
2323
},
2424
"target-dir": "Symfony/Component/OptionsResolver",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Process/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Process": "" }
2323
},
2424
"target-dir": "Symfony/Component/Process",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Routing/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,5 @@
3333
"psr-0": { "Symfony\\Component\\Routing": "" }
3434
},
3535
"target-dir": "Symfony/Component/Routing",
36-
"minimum-stability": "dev",
37-
"extra": {
38-
"branch-alias": {
39-
"dev-master": "2.1-dev"
40-
}
41-
}
36+
"minimum-stability": "dev"
4237
}

‎src/Symfony/Component/Security/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,5 @@
4040
"psr-0": { "Symfony\\Component\\Security": "" }
4141
},
4242
"target-dir": "Symfony/Component/Security",
43-
"minimum-stability": "dev",
44-
"extra": {
45-
"branch-alias": {
46-
"dev-master": "2.1-dev"
47-
}
48-
}
43+
"minimum-stability": "dev"
4944
}

‎src/Symfony/Component/Serializer/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Serializer": "" }
2323
},
2424
"target-dir": "Symfony/Component/Serializer",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Templating/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Templating": "" }
2323
},
2424
"target-dir": "Symfony/Component/Templating",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

‎src/Symfony/Component/Translation/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,5 @@
3030
"psr-0": { "Symfony\\Component\\Translation": "" }
3131
},
3232
"target-dir": "Symfony/Component/Translation",
33-
"minimum-stability": "dev",
34-
"extra": {
35-
"branch-alias": {
36-
"dev-master": "2.1-dev"
37-
}
38-
}
33+
"minimum-stability": "dev"
3934
}

‎src/Symfony/Component/Validator/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,5 @@
3232
"psr-0": { "Symfony\\Component\\Validator": "" }
3333
},
3434
"target-dir": "Symfony/Component/Validator",
35-
"minimum-stability": "dev",
36-
"extra": {
37-
"branch-alias": {
38-
"dev-master": "2.1-dev"
39-
}
40-
}
35+
"minimum-stability": "dev"
4136
}

‎src/Symfony/Component/Yaml/composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
"psr-0": { "Symfony\\Component\\Yaml": "" }
2323
},
2424
"target-dir": "Symfony/Component/Yaml",
25-
"minimum-stability": "dev",
26-
"extra": {
27-
"branch-alias": {
28-
"dev-master": "2.1-dev"
29-
}
30-
}
25+
"minimum-stability": "dev"
3126
}

0 commit comments

Comments
 (0)
0