Fix extra argument, clean up config (#58)

* remove unused config, remove outdated argument

* add another workflow

* phpstan

* fix argument

* fix neon errors

* Apply fixes from StyleCI

[ci skip] [skip ci]

* Fix typo

Co-authored-by: Steve Williamson <[email protected]>
Co-authored-by: Andreia Bohner <[email protected]>

Author: swilla

.github/workflows/phpstan.yml

@@ -0,0 +1,31 @@
+name: PHPStan
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'phpstan.neon.dist'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'phpstan.neon.dist'
+
+
+jobs:
+  phpstan:
+    name: phpstan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan --error-format=github

composer.json

@@ -24,6 +24,9 @@
     "require-dev": {
         "mockery/mockery": "^1.4",
         "orchestra/testbench": "^5.0 || ^6.0",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^8.4 || ^9.3.3"
     },
     "autoload": {
@@ -37,6 +40,7 @@
         }
     },
     "scripts": {
+        "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
 

config/config.php

@@ -54,15 +54,12 @@
     |
     | This value can be found on the API docs page:
     | https://airtable.com/[BASE_ID]/api/docs#curl/table:tasks
-    | The value will be hilighted at the beginning of each table section.
+    | The value will be highlighted at the beginning of each table section.
     | Example:
     | Each record in the `Tasks` contains the following fields
     |
      */
 
-    'log_http' => env('AIRTABLE_LOG_HTTP', false),
-    'log_http_format' => env('AIRTABLE_LOG_HTTP_FORMAT', '{request} >>> {res_body}'),
-
     'typecast' => env('AIRTABLE_TYPECAST', false),
 
     // The API is limited to 5 requests per second per base.

phpstan-baseline.neon

@@ -0,0 +1,12 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 2
+    paths:
+        - src
+        - config
+    tmpDir: build/phpstan
+    excludePaths:
+        - ./vendor
+    checkMissingIterableValueType: true

phpstan.neon.dist

@@ -24,7 +24,7 @@ public function create($data)
     }
 
     /**
-     * @param  dynamic  $args  (string) $id, $data | (array) $data
+     * @param  mixed  $args  (string) $id, $data | (array) $data
      * @return mixed
      *
      * @throws \InvalidArgumentException
@@ -45,7 +45,7 @@ public function update(...$args)
     }
 
     /**
-     * @param  dynamic  $args  (string) $id, $data | (array) $data
+     * @param  mixed  $args  (string) $id, $data | (array) $data
      * @return mixed
      *
      * @throws \InvalidArgumentException

src/Airtable.php

@@ -37,7 +37,6 @@ public function __construct($app)
      * Get a airtable table instance.
      *
      * @param  string  $table
-     * @return \Airtable\Table
      */
     public function table(string $table)
     {
@@ -56,7 +55,7 @@ protected function configuration($name)
     {
         $name = $name ?: $this->getDefaultTable();
 
-        // To get the aritable table configuration, we will just pull each of the
+        // To get the airtable table configuration, we will just pull each of the
         // connection configurations and get the configurations for the given name.
         // If the configuration doesn't exist, we'll throw an exception and bail.
         $tables = $this->app['config']['airtable.tables'];
@@ -112,18 +111,12 @@ protected function createAirtable($table, $table_base = false)
         $base = $table_base ?: $this->app['config']['airtable.base'];
         $access_token = $this->app['config']['airtable.key'];
 
-        if ($this->app['config']['airtable.log_http']) {
-            $httpLogFormat = $this->app['config']['airtable.log_http_format'];
-        } else {
-            $httpLogFormat = null;
-        }
-
         $airtableTypeCast = $this->app['config']['airtable.typecast'];
         $delay = $this->app['config']['airtable.delay_between_requests'];
 
-        $client = new AirtableApiClient($base, $table, $access_token, $httpLogFormat, null, $airtableTypeCast, $delay);
+        $client = new AirtableApiClient($base, $table, $access_token, null, $airtableTypeCast, $delay);
 
-        return new Airtable($client, $table);
+        return new Airtable($client);
     }
 
     /**
@@ -146,6 +139,9 @@ protected function getConfig($name)
      */
     public function __call($method, $parameters)
     {
-        return $this->table()->$method(...$parameters);
+        $defaultConfig = $this->app['config']['airtable.default'];
+        $defaultTable = $this->app['config']["airtable.tables.{$defaultConfig}"]['name'];
+
+        return $this->table($defaultTable)->$method(...$parameters);
     }
 }