WIP

Author: sander3

.github/workflows/laravel.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
     - uses: actions/checkout@v2
     - name: Cache Dependencies
       uses: actions/cache@v1

.php_cs renamed to .php-cs-fixer.php

@@ -10,10 +10,14 @@
     ->exclude($excluded_folders)
     ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
-        '@Symfony'                          => true,
-        'binary_operator_spaces'            => ['align_double_arrow' => true],
+        '@Symfony'               => true,
+        'binary_operator_spaces' => [
+            'operators' => [
+                '=>' => 'align_single_space_minimal',
+            ],
+        ],
         'array_syntax'                      => ['syntax' => 'short'],
         'linebreak_after_opening_tag'       => true,
         'not_operator_with_successor_space' => true,

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["laravel", "sendcloud", "soved", "shipping", "parcel"],
     "type": "library",
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "illuminate/http": "^8.0",
         "illuminate/support": "^8.0"

readme.md

@@ -1,21 +1,10 @@
 # Send parcels using the Sendcloud Shipping API
 
-⚠️ Work in progress!
-
-Supported endpoints:
-- `GET` parcels
-- `GET` parcels/statuses
-- `GET` parcels/{id}
-- `POST` parcels
-- `POST` parcels/{id}/cancel
-- `GET` shipping_methods
-
 [![tests](https://github.com/sander3/laravel-sendcloud/workflows/Laravel/badge.svg)](https://github.com/sander3/laravel-sendcloud/actions?query=workflow%3ALaravel)
-[![codecov](https://codecov.io/gh/sander3/laravel-sendcloud/branch/master/graph/badge.svg)](https://codecov.io/gh/sander3/laravel-sendcloud)
 
 ## Requirements
 
-- PHP >= 7.4
+- PHP >= 8.0
 - Laravel >= 8.0
 
 ## Security Vulnerabilities

src/Exceptions/ResponseException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Soved\Laravel\Sendcloud\Exceptions;
+
+use Exception;
+
+class ResponseException extends Exception
+{
+}

src/Exceptions/ValidationException.php

@@ -8,10 +8,9 @@ class ValidationException extends Exception
 {
     public array $missingKeys;
 
-    public function __construct(array $missingKeys)
-    {
+    public function __construct(
+        public array $missingKeys
+    ) {
         parent::__construct('The given data was invalid.');
-
-        $this->missingKeys = $missingKeys;
     }
 }

src/Sendcloud.php

@@ -6,6 +6,7 @@
 use Soved\Laravel\Sendcloud\Data\ParcelData;
 use Soved\Laravel\Sendcloud\Data\SenderData;
 use Soved\Laravel\Sendcloud\Contracts\SendcloudContract;
+use Soved\Laravel\Sendcloud\Exceptions\ResponseException;
 
 class Sendcloud implements SendcloudContract
 {
@@ -91,7 +92,13 @@ private function request(string $method, string $endpoint, array $data = [], boo
             $response->throw();
         }
 
-        return $response->json();
+        $decoded = $response->json();
+
+        if (null === $decoded) {
+            throw new ResponseException();
+        }
+
+        return $decoded;
     }
 
     private function getUrl(string $endpoint): string

src/SendcloudServiceProvider.php

@@ -9,15 +9,6 @@
 
 class SendcloudServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-    }
-
     /**
      * Register the application services.
      *