Fix GetTest::testHandleGet

src/Controller/Controller.php

@@ -148,14 +148,16 @@ public static function viewData(
             $viewParameters->meta = $meta;
         }
 
-        $response->getBody()->write(json_encode($viewParameters));
-
-        return $response
+        $response = $response
             ->withStatus(200)
             ->withHeader(
                 'Content-Type',
                 'application/vnd.api+json;charset=utf-8'
             );
+
+        $response->getBody()->write(json_encode($viewParameters));
+
+        return $response;
     }
 
     /**

src/Controller/Get.php

@@ -40,6 +40,7 @@ trait Get
      * @param ResourceModel          $model
      * @param array                  $directives
      * @return ResponseInterface
+     * @todo add links
      */
     public static function handleGet(
         ServerRequestInterface $request,

src/Resource.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Copyright 2015-2016 Xenofon Spafaridis
  *
@@ -14,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Phramework\JSONAPI;
 
-use Directive\Model\Directives;
 use Phramework\JSONAPI\Directive\Directive;
 use Phramework\Util\Util;
 
@@ -31,8 +32,8 @@
  * @property \stdClass $links
  * @property \stdClass $attributes
  * @property \stdClass $relationships
- * @property \stdClass $data
  * @property \stdClass $private-attributes
+ * @property \stdClass $'attributes-meta'
  */
 class Resource extends \stdClass implements \JsonSerializable
 {
@@ -73,10 +74,10 @@ class Resource extends \stdClass implements \JsonSerializable
      * @param string $type
      * @param string $id
      */
-    public function __construct($type, $id)
+    public function __construct(string $type, string $id)
     {
         $this->type = $type;
-        $this->id   = (string) $id;
+        $this->id   = $id;
     }
 
     /**
@@ -99,7 +100,7 @@ public function __set($name, $value)
 
             $this->{$name} = $value;
         } elseif (in_array($name, ['id', 'type'])) {
-            $this->{$name} = $value;
+            $this->{$name} = (string) $value;
         } else {
             throw new \Exception(sprintf(
                 'Undefined property via __set(): %s',

tests/bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Copyright 2015-2016 Xenofon Spafaridis
  *

tests/public/index.php

@@ -0,0 +1,31 @@
+<?php
+
+require __DIR__ . '/../bootstrap.php';
+/*
+var_dump(
+);*/
+
+class Ctrl
+{
+    use \Phramework\JSONAPI\Controller\Get;
+}
+
+// Using the createServer factory, providing it with the various superglobals:
+$server = Zend\Diactoros\Server::createServer(
+    function ($request, $response, $done) {
+        return Ctrl::handleGet(
+            $request,
+            $response,
+            \Phramework\JSONAPI\APP\Models\User::getResourceModel()
+        );
+
+        //$response->getBody()->write("Hello world!");
+    },
+    $_SERVER,
+    $_GET,
+    $_POST,
+    $_COOKIE,
+    $_FILES
+);
+
+$server->listen();

tests/src/Controller/GetTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Copyright 2015-2016 Xenofon Spafaridis
  *
@@ -55,7 +56,7 @@ public function testHandleGet()
             $response->getHeader('Content-Type')[0]
         );
 
-        $body = $response->getBody()->getContents();
+        $body = $response->getBody()->__toString();
 
         $this->assertTrue(Util::isJSON($body));