Merge pull request #35 from protecinnovations/update-dep

Update Dep on proxy-manager to 1.0.*
Ocramius · Jun 30, 2015 · 0ca5d24 · 0ca5d24
2 parents 5850b5b + 39f6ee9
commit 0ca5d24
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,12 @@ php:
   - 5.5
   - 5.6
   - hhvm
-  - hhvm-nightly
 
 before_script:
   - composer update --prefer-source
 
 script:
   - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 ./src ./tests
 
 notifications:
   irc: "irc.freenode.org#zftalk.modules"
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "zendframework/zend-servicemanager":  "~2.2",
         "zendframework/zend-modulemanager":   "~2.2",
         "zendframework/zend-http":            "~2.2",
-        "ocramius/proxy-manager":             "0.5.*"
+        "ocramius/proxy-manager":             "1.0.*"
     },
     "require-dev": {
         "zendframework/zendframework":        "~2.2",