Remove Safe dependency

Author: loevgaard

.github/workflows/build.yaml

@@ -12,15 +12,15 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.2', '7.3']
+                php-versions: ['7.4']
         steps:
             -   name: Checkout
-                uses: actions/checkout@v1
+                uses: actions/checkout@v4
             -   name: Setup PHP, with composer and extensions
-                uses: shivammathur/setup-php@master
+                uses: shivammathur/setup-php@v2
                 with:
                     php-version: ${{ matrix.php-versions }}
-                    extension-csv: intl
+                    extensions: intl
             -   name: Install Composer dependencies
                 run: composer update --no-progress --no-suggest --prefer-dist --no-interaction
             -   name: Validate composer

README.md

@@ -13,7 +13,7 @@ A PHP SDK for the [DAO](http://www.dao.as) [API](https://api.dao.as/docs/).
 Open a command console, enter your project directory and execute the following command to download the latest stable version of this library:
 
 ```bash
-$ composer require setono/dao-php-sdk
+composer require setono/dao-php-sdk
 ```
 
 This command requires you to have Composer installed globally, as explained in the [installation chapter](https://getcomposer.org/doc/00-intro.md) of the Composer documentation.

composer.json

@@ -11,10 +11,10 @@
     ],
     "require": {
         "php": ">=7.4",
+        "ext-json": "*",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
-        "thecodingmachine/safe": "^1.0",
         "webmozart/assert": "^1.4"
     },
     "require-dev": {
@@ -26,11 +26,14 @@
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.0",
-        "sylius-labs/coding-standard": "^3.1",
-        "thecodingmachine/phpstan-safe-rule": "^1.0@beta"
+        "sylius-labs/coding-standard": "^3.1"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": false,
+            "ergebnis/composer-normalize": true
+        }
     },
     "extra": {
         "branch-alias": {

phpstan.neon

@@ -1,7 +1,6 @@
 includes:
 	- vendor/korbeil/phpstan-generic-rules/extension.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
-	- vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
 
 parameters:
 	checkMissingIterableValueType: false

spec/Client/ClientSpec.php

@@ -12,8 +12,6 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Safe\Exceptions\JsonException;
-use Safe\Exceptions\StringsException;
 use Setono\DAO\Client\Client;
 use Setono\DAO\Client\ClientInterface;
 use Setono\DAO\Exception\ApiException;
@@ -42,11 +40,6 @@ public function it_implements_client_interface(): void
         $this->shouldImplement(ClientInterface::class);
     }
 
-    /**
-     * @throws ClientExceptionInterface
-     * @throws JsonException
-     * @throws StringsException
-     */
     public function it_gets(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
@@ -70,9 +63,6 @@ public function it_gets(
         ]);
     }
 
-    /**
-     * @throws ClientExceptionInterface
-     */
     public function it_throws_not_ok_status_code_exception(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
@@ -88,10 +78,6 @@ public function it_throws_not_ok_status_code_exception(
         $this->shouldThrow(NotOkStatusCodeException::class)->during('get', ['endpoint']);
     }
 
-    /**
-     * @throws ClientExceptionInterface
-     * @throws StringsException
-     */
     public function it_throws_api_exception(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,

src/Client/Client.php

@@ -4,14 +4,10 @@
 
 namespace Setono\DAO\Client;
 
-use InvalidArgumentException;
 use const PHP_QUERY_RFC3986;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface as HttpClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
-use Safe\Exceptions\JsonException;
-use Safe\Exceptions\StringsException;
-use function Safe\json_decode;
 use Setono\DAO\Exception\ApiException;
 use Setono\DAO\Exception\NotOkStatusCodeException;
 use Webmozart\Assert\Assert;
@@ -47,14 +43,6 @@ public function __construct(
         $this->baseUrl = $baseUrl;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws ClientExceptionInterface
-     * @throws JsonException
-     * @throws StringsException
-     * @throws InvalidArgumentException
-     */
     public function get(string $endpoint, array $params = []): array
     {
         Assert::notContains($endpoint, '?', 'Do not add query parameters to the endpoint. Instead use the third argument, $params');

src/Exception/RequestException.php

@@ -7,8 +7,6 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
-use Safe\Exceptions\StringsException;
-use function Safe\sprintf;
 
 abstract class RequestException extends RuntimeException
 {
@@ -21,9 +19,6 @@ abstract class RequestException extends RuntimeException
     /** @var int */
     private $statusCode;
 
-    /**
-     * @throws StringsException
-     */
     public function __construct(RequestInterface $request, ResponseInterface $response, int $statusCode)
     {
         $this->request = $request;