Merge remote-tracking branch 'igorw/symfony-bundle'

Conflicts: composer.json
Herzult · Oct 20, 2013 · 21d9023 · 21d9023
2 parents f80f12b + f743e6f
commit 21d9023
Show file tree

Hide file tree

Showing 7 changed files with 887 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
     ],
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "whatthejeff/nyancat-phpunit-resultprinter": "1.0.*@dev"
+        "whatthejeff/nyancat-phpunit-resultprinter": "1.0.*@dev",
+        "symfony/framework-bundle": "~2.1"
     },
     "autoload": {
         "psr-0": { "SimplePHPEasyPlus": "src" }