Merge pull request #22 from rodnaph/remove-safe

Remove Safe

.github/workflows/continuous-integration.yml

@@ -0,0 +1,23 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  pull_request_target:
+  push:
+    branches:
+      - master
+
+jobs:
+  ci:
+    name: "Run Build"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+
+      - name: "Run Lint"
+        run: make lint
+
+      - name: "Run Tests"
+        run: make test

composer.json

@@ -28,14 +28,12 @@
     "php-http/httplug": ">=1.0",
     "php-http/discovery": "^1.0",
     "guzzlehttp/psr7": "^1.4.2",
-    "php-http/message": "^1.0",
-    "thecodingmachine/safe": "^1.0"
+    "php-http/message": "^1.0"
   },
   "require-dev" : {
     "phpunit/phpunit": "^7",
     "squizlabs/php_codesniffer": "^3.2",
     "phpstan/phpstan": "^0.12.7",
-    "thecodingmachine/phpstan-safe-rule": "^1.0",
     "thecodingmachine/phpstan-strict-rules": "^0.12.0",
     "php-http/mock-client": "^1.0",
     "php-http/guzzle6-adapter": "^1.1",

phpstan.neon

@@ -1,3 +1,2 @@
 includes:
-    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
-    - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
+    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

src/Client.php

@@ -11,10 +11,9 @@
 use Http\Discovery\MessageFactoryDiscovery;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Safe\Exceptions\FilesystemException;
-use function Safe\fclose;
-use function Safe\fopen;
-use function Safe\fwrite;
+use function fclose;
+use function fopen;
+use function fwrite;
 
 final class Client
 {
@@ -57,8 +56,17 @@ public function store(GotenbergRequestInterface $request, string $destination):
         $response = $this->handleResponse($this->client->sendRequest($this->makeMultipartFormDataRequest($request)));
         $fileStream = $response->getBody();
         $fp = fopen($destination, 'w');
-        fwrite($fp, $fileStream->getContents());
-        fclose($fp);
+        if ($fp === false) {
+            throw FilesystemException::createFromPhpError();
+        }
+
+        if (fwrite($fp, $fileStream->getContents()) === false) {
+            throw FilesystemException::createFromPhpError();
+        }
+
+        if (fclose($fp) === false) {
+            throw FilesystemException::createFromPhpError();
+        }
     }
 
     private function makeMultipartFormDataRequest(GotenbergRequestInterface $request): RequestInterface

src/DocumentFactory.php

@@ -6,10 +6,9 @@
 
 use GuzzleHttp\Psr7\LazyOpenStream;
 use Psr\Http\Message\StreamInterface;
-use Safe\Exceptions\FilesystemException;
+use function fopen;
+use function fwrite;
 use function GuzzleHttp\Psr7\stream_for;
-use function Safe\fopen;
-use function Safe\fwrite;
 
 final class DocumentFactory
 {
@@ -29,7 +28,13 @@ public static function makeFromStream(string $fileName, StreamInterface $fileStr
     public static function makeFromString(string $fileName, string $string): Document
     {
         $fileStream = fopen('php://memory', 'rb+');
-        fwrite($fileStream, $string);
+        if ($fileStream === false) {
+            throw FilesystemException::createFromPhpError();
+        }
+
+        if (fwrite($fileStream, $string) === false) {
+            throw FilesystemException::createFromPhpError();
+        }
 
         return new Document($fileName, stream_for($fileStream));
     }

src/FilesystemException.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TheCodingMachine\Gotenberg;
+
+use ErrorException;
+use RuntimeException;
+use function error_get_last;
+
+class FilesystemException extends ErrorException
+{
+    public static function createFromPhpError(): self
+    {
+        $error = error_get_last();
+
+        if ($error === null) {
+            throw new RuntimeException('No error information available');
+        }
+
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
+    }
+}

tests/ClientTest.php

@@ -6,7 +6,6 @@
 
 use HTTP\Client\Exception;
 use PHPUnit\Framework\TestCase;
-use Safe\Exceptions\FilesystemException;
 
 final class ClientTest extends TestCase
 {

tests/DocumentFactoryTest.php

@@ -6,7 +6,6 @@
 
 use GuzzleHttp\Psr7\LazyOpenStream;
 use PHPUnit\Framework\TestCase;
-use Safe\Exceptions\FilesystemException;
 
 final class DocumentFactoryTest extends TestCase
 {

tests/FilesystemExceptionTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TheCodingMachine\Gotenberg;
+
+use ErrorException;
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
+use function error_clear_last;
+use function fclose;
+use function fopen;
+
+class FilesystemExceptionTest extends TestCase
+{
+    public function testExceptionCanBeCreated(): void
+    {
+        $fp = fopen('php://memory', 'r');
+        fclose($fp);
+        @fclose($fp);
+
+        $exception = FilesystemException::createFromPhpError();
+
+        $this->assertInstanceOf(ErrorException::class, $exception);
+        $this->assertSame('fclose(): supplied resource is not a valid stream resource', $exception->getMessage());
+        $this->assertSame(0, $exception->getCode());
+        $this->assertSame(2, $exception->getSeverity());
+    }
+
+    public function testExceptionThrownWhenNoError(): void
+    {
+        error_clear_last();
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('No error information available');
+
+        FilesystemException::createFromPhpError();
+    }
+}