Merge pull request #109 from dizda/Nyholm-patch-1

Specify version of google/apiclient
dizda · Oct 11, 2016 · e79a1dc · e79a1dc
2 parents 812b621 + 90cb730
commit e79a1dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: php
 sudo: false 
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

diff --git a/composer.json b/composer.json
@@ -19,13 +19,13 @@
     ],
 
     "require": {
-        "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1",
-        "symfony/monolog-bundle": "~2.3"
+        "php": "^5.4 || ^7.0",
+        "symfony/framework-bundle": "^2.1 || ^3.0",
+        "symfony/monolog-bundle": "^2.3"
     },
 
     "require-dev": {
-        "google/apiclient": "@dev",
+        "google/apiclient": "1.1.7",
         "symfony/symfony": "^2.3.25"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ language: php @@
     sudo: false
     php:
-      - 5.3
       - 5.4
       - 5.5
       - 5.6
@@ Expand Down @@