Revert "Rename resource interface" to prevent confusion with native

resource type This reverts commit d9e1f5f.
Stratadox · Feb 2, 2020 · b63f4d0 · b63f4d0
1 parent d9e1f5f
commit b63f4d0
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/src/BasicResource.php b/src/BasicResource.php
@@ -2,7 +2,7 @@
 
 namespace Stratadox\RestResource;
 
-final class BasicResource implements Resource
+final class BasicResource implements RestResource
 {
     /** @var string */
     private $name;

diff --git a/src/CannotFormatJson.php b/src/CannotFormatJson.php
@@ -8,7 +8,7 @@
 
 final class CannotFormatJson extends InvalidArgumentException implements Unformattable
 {
-    public static function because(Resource $resource, Throwable $reason): self
+    public static function because(RestResource $resource, Throwable $reason): self
     {
         return new self(sprintf(
             'Could not format the resource `%s` as json, because: %s',
@@ -17,7 +17,7 @@ public static function because(Resource $resource, Throwable $reason): self
         ), $reason->getCode(), $reason);
     }
 
-    public static function jsonError(Resource $resource, string $error): self
+    public static function jsonError(RestResource $resource, string $error): self
     {
         return new self(sprintf(
             'Could not format the resource `%s` as json, because: %s',

diff --git a/src/CannotFormatXml.php b/src/CannotFormatXml.php
@@ -8,7 +8,7 @@
 
 final class CannotFormatXml extends InvalidArgumentException implements Unformattable
 {
-    public static function because(Resource $resource, Throwable $reason): self
+    public static function because(RestResource $resource, Throwable $reason): self
     {
         return new self(sprintf(
             'Could not format the resource `%s` as xml, because: %s',

diff --git a/src/DefaultJsonFormatter.php b/src/DefaultJsonFormatter.php
@@ -19,7 +19,7 @@ public function __construct(string $baseUri)
         $this->baseUri = $baseUri;
     }
 
-    public function from(Resource $resource): string
+    public function from(RestResource $resource): string
     {
         try {
             $result = json_encode([

diff --git a/src/LinkRetrieval.php b/src/LinkRetrieval.php
@@ -7,7 +7,7 @@
 
 trait LinkRetrieval
 {
-    private function linksOf(Resource $resource, string $baseUri): array
+    private function linksOf(RestResource $resource, string $baseUri): array
     {
         if (!count($resource->links())) {
             return [];

diff --git a/src/ResourceFormatter.php b/src/ResourceFormatter.php
@@ -7,9 +7,9 @@ interface ResourceFormatter
     /**
      * Formats a response based on a rest resource.
      *
-     * @param Resource $resource The resource to format.
+     * @param RestResource $resource The resource to format.
      * @return string                The presentable output.
      * @throws Unformattable         When the resource cannot be formatted.
      */
-    public function from(Resource $resource): string;
+    public function from(RestResource $resource): string;
 }
diff --git a/src/Resource.php → src/RestResource.php b/src/Resource.php → src/RestResource.php
@@ -2,7 +2,7 @@
 
 namespace Stratadox\RestResource;
 
-interface Resource
+interface RestResource
 {
     /**
      * Retrieves the body or the resource.

diff --git a/src/XmlFormatter.php b/src/XmlFormatter.php
@@ -28,7 +28,7 @@ public static function in(
         return new static($baseUri, BoogieSingularizer::in($locale));
     }
 
-    public function from(Resource $resource): string
+    public function from(RestResource $resource): string
     {
         $xml = new SimpleXMLElement(sprintf(
             '<?xml version="1.0"?><%s />',

diff --git a/tests/Fixture/HateoasResource.php b/tests/Fixture/HateoasResource.php
@@ -3,9 +3,9 @@
 namespace Stratadox\RestResource\Test\Fixture;
 
 use Stratadox\RestResource\Links;
-use Stratadox\RestResource\Resource;
+use Stratadox\RestResource\RestResource;
 
-final class HateoasResource implements Resource
+final class HateoasResource implements RestResource
 {
     /** @var array */
     private $body;

diff --git a/tests/Fixture/MinimalResource.php b/tests/Fixture/MinimalResource.php
@@ -3,9 +3,9 @@
 namespace Stratadox\RestResource\Test\Fixture;
 
 use Stratadox\RestResource\Links;
-use Stratadox\RestResource\Resource;
+use Stratadox\RestResource\RestResource;
 
-final class MinimalResource implements Resource
+final class MinimalResource implements RestResource
 {
     /** @var array */
     private $body;