pulling in changes from master

Author: ryanmats

.travis.yml

@@ -41,11 +41,18 @@ before_install:
   - mkdir -p build/logs
 
 before_script:
-  - pecl install grpc
+  - travis_retry pecl install grpc-1.4.1
 
 script:
   - testing/run_all_tests.sh
 
 after_success:
-  - composer require "satooshi/php-coveralls:^1.0"
-  - travis_retry php vendor/bin/coveralls -v
+  - |
+    # if we are running all the tests, run coveralls
+    FILES_CHANGED=$(git diff --name-only HEAD $(git merge-base HEAD master))
+    if grep -q ^testing\/ <<< "$FILES_CHANGED" || \
+      grep -qv \/ <<< "$FILES_CHANGED" || \
+      [ -e $TRAVIS_PULL_REQUEST_BRANCH ]; then
+      composer require "satooshi/php-coveralls:^1.0"
+      travis_retry php vendor/bin/coveralls -v
+    fi

language/api/README.md

@@ -189,6 +189,13 @@ to [browse the source][google-cloud-php-source] and  [report issues][google-clou
 
 ## Troubleshooting
 
+If you get the following error, set the environment variable `GCLOUD_PROJECT` to your project ID:
+
+```
+[Google\Cloud\Core\Exception\GoogleException]
+No project ID was provided, and we were unable to detect a default project ID.
+```
+
 If you have not set a timezone you may get an error from php. This can be resolved by:
 
   1. Finding where the php.ini is stored by running php -i | grep 'Configuration File'

language/api/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-language": "^0.3",
+        "google/cloud-language": "^0.4",
         "symfony/console": "^3.0",
         "google/cloud-storage": "^1.0",
         "symfony/yaml": "^3.2"