Merge (#23)

* Fix typo

* Remove extra whitespace

* Fix typos (#20)

* Pass an empty array instead of null so the JSON will properly encode (#21)

* Pass an empty array instead of null so the JSON will properly encode

* Force data to be an array even if its explicitly null

* Swap PHP security checker

* Fix action syntax

* Remove deprecated --no-suggest flag

* Don't need this; it defaults to finding the lock file there

* Feature/bugfixes (#22)

* Pass an empty array instead of null so the JSON will properly encode

* Force data to be an array even if its explicitly null

* Switch our PHP Security Checker

* Bump version number

* If data is empty, make sure that the body of the request is null and not empty JSON

* Fix test

* Bump version number

Author: ssfinney

.github/workflows/ci.yml

@@ -34,13 +34,11 @@ jobs:
           coverage: pcov
 
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: PHP Security Checker
-        uses: StephaneBour/actions-php-security-checker@1.0
+        uses: symfonycorp/security-checker-action@v2
         if: ${{ matrix.stability == 'prefer-stable' }}
-        with:
-          composer-lock: './composer.lock'
 
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover=coverage.clover --verbose

VERSION

@@ -1 +1 @@
-1.2.5
+1.2.7

src/Api/Client.php

@@ -74,7 +74,7 @@ public function delete($path): ?array
      */
     public function get($path): ?array
     {
-        return $this->request($path, null, 'GET');
+        return $this->request($path, [], 'GET');
     }
 
     /**
@@ -195,7 +195,7 @@ public function request($path, $data = [], $method = 'GET'): ?array
                             'Authorization' => $this->token,
                             'Content-Type'  => 'application/json',
                         ],
-                        'body'    => json_encode($data),
+                        'body'    => empty($data) ? null : json_encode($data),
                     ]
                 )
                              ->getBody()

src/Concerns/HasClickUp.php

@@ -68,7 +68,6 @@ public function getClickupAttribute()
      */
     public function getClickupTokenAttribute()
     {
-
         if (!is_null($this->attributes['clickup_token'])) {
             return $this->resolveEncrypter()
                         ->decrypt($this->attributes['clickup_token']);

src/Interval.php

@@ -37,7 +37,7 @@ class Interval extends Model
         'time'       => 'integer',
     ];
 
-    // TODO: Figure out how to setup reflation to task
+    // TODO: Figure out how to setup relation to task
     /**
      * @return ChildOf
      * @throws InvalidRelationshipException

src/Support/Model.php

@@ -151,7 +151,7 @@ public function __construct(array $attributes = [], Model $parentModel = null)
     {
         // All dates from API comes as epoch with milliseconds
         $this->dateFormat = 'Uv';
-        // None of this  models will use timestamps, but need the date casting
+        // None of these models will use timestamps, but need the date casting
         $this->timestamps = false;
 
         $this->syncOriginal();

tests/Api/ClientTest.php

@@ -259,7 +259,7 @@ public function it_makes_expected_request_to_api($function, $method, $data, $par
                                           'Authorization' => $token,
                                           'Content-Type'  => 'application/json',
                                       ],
-                                      'body'    => json_encode($data),
+                                      'body'    => empty($options) ? null : json_encode($options),
                                   ],
                               ]
                           )

tests/Support/ModelTest.php

@@ -203,7 +203,7 @@ public function it_raises_exception_to_using_an_non_relation_as_a_relation()
     {
         $this->expectException(LogicException::class);
 
-        $this->model->nonrealation;
+        $this->model->nonrelation;
     }
 
     /**
@@ -213,7 +213,7 @@ public function it_raises_exception_to_using_a_null_as_a_relation()
     {
         $this->expectException(LogicException::class);
 
-        $this->model->nullrealation;
+        $this->model->nullrelation;
     }
 
     /**

tests/Support/Stubs/Model.php

@@ -63,12 +63,12 @@ public function related(): HasMany
         return $this->hasMany(Model::class);
     }
 
-    public function nonrealation()
+    public function nonrelation()
     {
         return new stdClass();
     }
 
-    public function nullrealation()
+    public function nullrelation()
     {
         return null;
     }