8000 merged 2.0 · DavidChristmann/symfony@a7f7be2 · GitHub
[go: up one dir, main page]
Skip to content

Commit a7f7be2

Browse files
fabpotfabpot
committed
merged 2.0
2 parents 5f9bcef + 29bc415 commit a7f7be2

File tree

20 files changed

+93
-92
lines changed

20 files changed

+93
-92
lines changed

‎composer.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,38 @@
2020
"php": ">=5.3.2"
2121
},
2222
"replace": {
23-
"symfony/doctrine-bridge": "2.1.*",
24-
"symfony/monolog-bridge": "2.1.*",
25-
"symfony/twig-bridge": "2.1.*",
26-
"symfony/doctrine-abstract-bundle": "2.1.*",
27-
"symfony/doctrine-bundle": "2.1.*",
28-
"symfony/framework-bundle": "2.1.*",
29-
"symfony/monolog-bundle": "2.1.*",
30-
"symfony/security-bundle": "2.1.*",
31-
"symfony/swiftmailer-bundle": "2.1.*",
32-
"symfony/twig-bundle": "2.1.*",
33-
"symfony/web-profiler-bundle": "2.1.*",
34-
"symfony/browser-kit": "2.1.*",
35-
"symfony/class-loader": "2.1.*",
36-
"symfony/config": "2.1.*",
37-
"symfony/console": "2.1.*",
38-
"symfony/css-selector": "2.1.*",
39-
"symfony/dependency-injection": "2.1.*",
40-
"symfony/dom-crawler": "2.1.*",
41-
"symfony/event-dispatcher": "2.1.*",
42-
"symfony/finder": "2.1.*",
43-
"symfony/form": "2.1.*",
44-
"symfony/http-foundation": "2.1.*",
45-
"symfony/http-kernel": "2.1.*",
46-
"symfony/locale": "2.1.*",
47-
"symfony/process": "2.1.*",
48-
"symfony/routing": "2.1.*",
49-
"symfony/security": "2.1.*",
50-
"symfony/serializer": "2.1.*",
51-
"symfony/templating": "2.1.*",
52-
"symfony/translation": "2.1.*",
53-
"symfony/validator": "2.1.*",
54-
"symfony/yaml": "2.1.*"
23+
"symfony/doctrine-bridge": "self.version",
24+
"symfony/monolog-bridge": "self.version",
25+
"symfony/twig-bridge": "self.version",
26+
"symfony/doctrine-abstract-bundle": "self.version",
27+
"symfony/doctrine-bundle": "self.version",
28+
"symfony/framework-bundle": "self.version",
29+
"symfony/monolog-bundle": "self.version",
30+
"symfony/security-bundle": "self.version",
31+
"symfony/swiftmailer-bundle": "self.version",
32+
"symfony/twig-bundle": "self.version",
33+
"symfony/web-profiler-bundle": "self.version",
34+
"symfony/browser-kit": "self.version",
35+
"symfony/class-loader": "self.version",
36+
"symfony/config": "self.version",
37+
"symfony/console": "self.version",
38+
"symfony/css-selector": "self.version",
39+
"symfony/dependency-injection": "self.version",
40+
"symfony/dom-crawler": "self.version",
41+
"symfony/event-dispatcher": "self.version",
42+
"symfony/finder": "self.version",
43+
"symfony/form": "self.version",
44+
"symfony/http-foundation": "self.version",
45+
"symfony/http-kernel": "self.version",
46+
"symfony/locale": "self.version",
47+
"symfony/process": "self.version",
48+
"symfony/routing": "self.version",
49+
"symfony/security": "self.version",
50+
"symfony/serializer": "self.version",
51+
"symfony/templating": "self.version",
52+
"symfony/translation": "self.version",
53+
"symfony/validator": "self.version",
54+
"symfony/yaml": "self.version"
5555
},
5656
"autoload": {
5757
"psr-0": { "Symfony": "src/" }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"php": ">=5.3.2"
2121
},
2222
"recommend": {
23-
"doctrine/dbal": ">=2.2",
24-
"doctrine/orm": ">=2.2"
23+
"doctrine/dbal": ">=2.1",
24+
"doctrine/orm": ">=2.1"
2525
},
2626
"suggest": {
27-
"symfony/form": ">=2.1.0-dev",
28-
"symfony/validator": ">=2.1.0-dev"
27+
"symfony/form": "self.version",
28+
"symfony/validator": "self.version"
2929
},
3030
"autoload": {
3131
"psr-0": { "Symfony\\Bridge\\Doctrine": "" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"symfony/http-kernel": ">=2.1.0-dev",
22-
"monolog/monolog": ">=1.0"
21+
"symfony/http-kernel": "self.version",
22+
"monolog/monolog": "1.*"
2323
},
2424
"autoload": {
2525
"psr-0": { "Symfony\\Bridge\\Monolog": "" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"swiftmailer/swiftmailer": ">=4.1"
2222
},
2323
"suggest": {
24-
"symfony/http-kernel": ">=2.1.0-dev"
24+
"symfony/http-kernel": "self.version"
2525
},
2626
"autoload": {
2727
"psr-0": { "Symfony\\Bridge\\Swiftmailer": "" }

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"twig/twig": ">=1.4"
21+
"twig/twig": ">=1.1"
2222
},
2323
"suggest": {
24-
"symfony/form": ">=2.1.0-dev",
25-
"symfony/routing": ">=2.1.0-dev",
26-
"symfony/translation": ">=2.1.0-dev",
27-
"symfony/yaml": ">=2.1.0-dev"
24+
"symfony/form": "self.version",
25+
"symfony/routing": "self.version",
26+
"symfony/translation": "self.version",
27+
"symfony/yaml": "self.version"
2828
},
2929
"autoload": {
3030
"psr-0": { "Symfony\\Bridge\\Twig": "" }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"symfony/doctrine-bridge": ">=2.1.0-dev",
22-
"symfony/doctrine-abstract-bundle": ">=2.1.0-dev"
21+
"symfony/doctrine-bridge": "2.*",
22+
"symfony/doctrine-abstract-bundle": "2.*"
2323
},
2424
"recommend": {
25-
"doctrine/dbal": ">=2.2",
26-
"doctrine/orm": ">=2.2"
25+
"doctrine/dbal": "2.*",
26+
"doctrine/orm": "2.*"
2727
},
2828
"autoload": {
2929
"psr-0": { "Symfony\\Bundle\\DoctrineBundle": "" }

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"symfony/event-dispatcher": ">=2.1.0-dev",
22-
"symfony/http-kernel": ">=2.1.0-dev",
23-
"symfony/routing": ">=2.1.0-dev",
24-
"symfony/templating": ">=2.1.0-dev",
25-
"symfony/translation": ">=2.1.0-dev"
21+
"symfony/event-dispatcher": "self.version",
22+
"symfony/http-kernel": "self.version",
23+
"symfony/routing": "self.version",
24+
"symfony/templating": "self.version",
25+
"symfony/translator": "self.version",
26+
"doctrine/common": ">=2.1.0"
2627
},
2728
"recommend": {
28-
"symfony/console": ">=2.1.0-dev",
29-
"symfony/form": ">=2.1.0-dev",
30-
"symfony/validator": ">=2.1.0-dev"
29+
"symfony/console": "self.version",
30+
"symfony/form": "self.version",
31+
"symfony/validator": "self.version"
3132
},
3233
"autoload": {
3334
"psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"require": {
2020
"php": ">=5.3.2",
2121
"monolog/monolog": ">=1.0",
22-
"symfony/monolog-bridge": ">=2.1.0-dev"
22+
"symfony/monolog-bridge": "self.version"
2323
},
2424
"autoload": {
2525
"psr-0": { "Symfony\\Bundle\\MonologBundle": "" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"symfony/security": ">=2.1.0-dev"
21+
"symfony/security": "self.version"
2222
},
2323
"autoload": {
2424
"psr-0": { "Symfony\\Bundle\\SecurityBundle": "" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"twig/twig": ">=1.4",
22-
"symfony/twig-bridge": ">=2.1.0-dev"
21+
"twig/twig": ">=1.1",
22+
"symfony/twig-bridge": "self.version"
2323
},
2424
"autoload": {
2525
"psr-0": { "Symfony\\Bundle\\TwigBundle": "" }

0 commit comments

Comments
 (0)
0