Merge pull request #19 from adamculp/master

Travis and Scrutinizer working as expected

Author: adamculp

.env.default

@@ -2,5 +2,5 @@ BASE_URL='https://api.airtable.com'
 VERSION='v0'
 API_KEY=
 TEST_BASE_ID=
-TEST_TABLE_NAME=
-TEST_VIEW_NAME=
+TEST_TABLE_NAME='Table 1'
+TEST_VIEW_NAME='Grid View'

.travis.yml

@@ -1,32 +1,25 @@
 dist: trusty
 language: php
-
 php:
-  - 7.2
-  - 7.3
-  - 7.4
-  - hhvm
-
-## Cache composer
+- 7.2
+- 7.3
+- 7.4
 cache:
   directories:
-    - $HOME/.composer/cache
-
+  - "$HOME/.composer/cache"
 matrix:
   include:
-    - php: 7.2
-      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
-
+  - php: 7.2
+    env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
 before_script:
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
-
+- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
+- touch .env
 script:
-  - vendor/bin/phpcs --standard=psr2 src/
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
-
+- vendor/bin/phpcs --standard=psr2 src/
+- vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 after_script:
-  - |
-    if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
-      wget https://scrutinizer-ci.com/ocular.phar
-      php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    fi
+- |
+  if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
+    wget https://scrutinizer-ci.com/ocular.phar
+    php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  fi

src/AirtableClient.php

@@ -40,7 +40,7 @@ class AirtableClient
     public function __construct(string $baseId, Table $table)
     {
         $this->client = new Client([
-            'base_uri' => $_ENV['BASE_URL'] . '/' . $_ENV['VERSION'] . '/' . $baseId . '/'
+            'base_uri' => getenv('BASE_URL') . '/' . getenv('VERSION') . '/' . $baseId . '/'
         ]);
 
         $this->baseId = $baseId;
@@ -57,7 +57,7 @@ public function getClient(): Client
             $this->table->getName(),
             [
                 'headers' => [
-                    'Authorization' => 'Bearer ' . $_ENV['API_KEY'],
+                    'Authorization' => 'Bearer ' . getenv('API_KEY'),
                 ]
             ]
         );

src/Exception/BadGatewayException.php

@@ -18,5 +18,5 @@ class BadGatewayException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'Airtable\'s servers are restarting or an unexpected outage is in progress. You should generally not receive this error, and requests are safe to retry.';
+    protected $message = 'Airtable\'s servers are restarting, or an unexpected outage happened.';
 }

src/Exception/ForbiddenException.php

@@ -18,5 +18,5 @@ class ForbiddenException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'Accessing a protected resource with API credentials that don\'t have access to that resource.';
+    protected $message = 'Accessing a protected resource with bad API credentials.';
 }

src/Exception/InvalidRequestException.php

@@ -18,5 +18,5 @@ class InvalidRequestException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'The request data is invalid. This includes most of the base-specific validations. You will receive a detailed error message and code pointing to the exact issue.';
+    protected $message = 'The request data is invalid.';
 }

src/Exception/NotFoundException.php

@@ -18,5 +18,5 @@ class NotFoundException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'Route or resource is not found. This error is returned when the request hits an undefined route, or if the resource doesn\'t exist (e.g. has been deleted).';
+    protected $message = 'Route or resource not found.';
 }

src/Exception/PaymentRequiredException.php

@@ -18,5 +18,5 @@ class PaymentRequiredException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'The account associated with the API key making requests hits a quota that can be increased by upgrading the Airtable account plan.';
+    protected $message = 'Airtable quote hit for this account.';
 }

src/Exception/RequestEntityTooLargeException.php

@@ -18,5 +18,5 @@ class RequestEntityTooLargeException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'The request exceeded the maximum allowed payload size. You shouldn\'t encounter this under normal use.';
+    protected $message = 'The request exceeded the maximum allowed payload size.';
 }

src/Exception/ServiceUnavailableException.php

@@ -18,5 +18,5 @@ class ServiceUnavailableException extends AirtableException
     /**
      * @var string
      */
-    protected $message = 'The server could not process your request in time. The server could be temporarily unavailable, or it could have timed out processing your request. You should retry the request with backoffs.';
+    protected $message = 'The server could not process your request in time.';
 }