Skip to content

Commit ef8bbe3

Browse files
committed
merged branch Seldaek/psr3 (PR #28)
This PR was merged into the master branch. Commits ------- 8163be7 Update requirement for 2.2 Discussion ---------- Update to use latest monolog and PSR-3 Depends on symfony/symfony#6628 --------------------------------------------------------------------------- by stof at 2013-01-09T10:27:42Z This requires creating the 2.1 branch, right ? --------------------------------------------------------------------------- by stof at 2013-01-09T10:28:22Z nevermind, it already exists
2 parents 0e9e829 + 8163be7 commit ef8bbe3

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.2",
20-
"symfony/monolog-bridge": ">=2.1.0,<2.3-dev",
21-
"symfony/dependency-injection": ">=2.1.0,<2.3-dev",
22-
"symfony/config": ">=2.1.0,<2.3-dev",
23-
"monolog/monolog": ">=1.0,<1.3-dev"
20+
"symfony/monolog-bridge": "~2.2",
21+
"symfony/dependency-injection": "~2.2",
22+
"symfony/config": "~2.2",
23+
"monolog/monolog": "~1.3"
2424
},
2525
"require-dev": {
26-
"symfony/yaml": ">=2.1.0,<2.3-dev",
27-
"symfony/config": ">=2.1.0,<2.3-dev"
26+
"symfony/yaml": "~2.2"
2827
},
2928
"autoload": {
3029
"psr-0": { "Symfony\\Bundle\\MonologBundle": "" }
3130
},
3231
"target-dir": "Symfony/Bundle/MonologBundle",
3332
"extra": {
3433
"branch-alias": {
35-
"dev-master": "2.1.x-dev"
34+
"dev-master": "2.2.x-dev"
3635
}
3736
}
3837
}

0 commit comments

Comments
 (0)