Merge pull request #25 from umpirsky/fix/composer-deps

Update dependencies
umpirsky · Feb 25, 2015 · a2cdf86 · a2cdf86
2 parents 832aebf + 88daf55
commit a2cdf86
Show file tree

Hide file tree

Showing 3 changed files with 856 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 vendor
 phpunit.xml
-composer.lock
diff --git a/composer.json b/composer.json
@@ -11,18 +11,17 @@
     ],
     "require": {
         "php":                 ">=5.3.3",
-        "twig/twig":           ">=1.2.0,<2.0-dev",
-        "twig/extensions":     ">=1.0,<2.0",
-        "symfony/twig-bridge": ">=2.0,<3.0",
-        "symfony/routing":     ">=2.0,<3.0",
-        "symfony/filesystem":  ">=2.0,<3.0",
-        "symfony/translation": ">=2.0,<3.0",
-        "symfony/form":        ">=2.0,<3.0"
+        "twig/twig":           "~1.2",
+        "twig/extensions":     "~1.0",
+        "symfony/twig-bridge": "~2.0",
+        "symfony/routing":     "~2.0",
+        "symfony/filesystem":  "~2.0",
+        "symfony/translation": "~2.0",
+        "symfony/form":        "~2.0"
     },
     "require-dev": {
         "symfony/config":      "2.1.*"
     },
-    "minimum-stability": "dev",
     "autoload": {
         "psr-0": { "Twig\\Gettext": "." }
     },