content renamed to data

Author: Andrey Helldar

README.md

@@ -116,7 +116,7 @@ returned with code 400:
 
 ### returned array:
 ```php
-$content = [
+$data = [
     [
         'title' => 'Title #1',
         'description' => 'Description #1',
@@ -130,7 +130,7 @@ $content = [
 
 #### as error
 ```php
-return api_response($content, 400);
+return api_response($data, 400);
 ```
 returned with code 400:
 ```json
@@ -153,7 +153,7 @@ returned with code 400:
 
 #### as success
 ```php
-return api_response($content, 200);
+return api_response($data, 200);
 ```
 returned with code 200:
 ```json

src/Services/ResponseService.php

@@ -12,7 +12,7 @@ class ResponseService
     protected $with = [];
 
     /** @var null|string|int|array|object */
-    protected $content = null;
+    protected $data = null;
 
     /** @var array */
     protected $headers = [];
@@ -41,15 +41,15 @@ public function status(int $status = 200): self
     }
 
     /**
-     * @param mixed $content
+     * @param mixed $data
      *
      * @return $this
      */
-    public function content($content = null): self
+    public function data($data = null): self
     {
-        $this->content = $content instanceof Responsable
-            ? $this->toResponse($content)
-            : $content;
+        $this->data = $data instanceof Responsable
+            ? $this->toResponse($data)
+            : $data;
 
         return $this;
     }
@@ -83,7 +83,7 @@ public function headers(array $headers = []): self
      */
     public function response(): JsonResponse
     {
-        return JsonResponse::create($this->getContent(), $this->status_code, $this->headers);
+        return JsonResponse::create($this->getData(), $this->status_code, $this->headers);
     }
 
     protected function isError(): bool
@@ -93,7 +93,7 @@ protected function isError(): bool
 
     private function e($value = null, $doubleEncode = true)
     {
-        if (!is_string($value) || null === $value) {
+        if (! is_string($value) || null === $value) {
             return $value;
         }
 
@@ -102,37 +102,37 @@ private function e($value = null, $doubleEncode = true)
             : null;
     }
 
-    private function getContent()
+    private function getData()
     {
-        $content = $this->isError()
-            ? $this->getErrorContent()
-            : $this->getSuccessContent();
+        $data = $this->isError()
+            ? $this->getErrorData()
+            : $this->getSuccessData();
 
-        return $this->mergeWith($content);
+        return $this->mergeDataWith($data);
     }
 
-    private function getErrorContent(): array
+    private function getErrorData(): array
     {
         return [
             'error' => [
                 'code' => $this->status_code,
-                'data' => $this->e($this->content),
+                'data' => $this->e($this->data),
             ],
         ];
     }
 
-    private function getSuccessContent()
+    private function getSuccessData()
     {
         return [
-            'data' => $this->e($this->content),
+            'data' => $this->e($this->data),
         ];
     }
 
-    private function mergeWith(array $content = []): array
+    private function mergeDataWith(array $data = []): array
     {
         return $this->with
-            ? array_merge($content, $this->with)
-            : $content;
+            ? array_merge($data, $this->with)
+            : $data;
     }
 
     private function toResponse(Responsable $content)

src/helpers.php

@@ -6,18 +6,18 @@
 /**
  * Return a new response from the application.
  *
- * @param null|string|int|array|object $content
+ * @param null|mixed $data
  * @param int $status_code
  * @param array $headers
  * @param array $with
  *
  * @return JsonResponse
  */
-function api_response($content = null, $status_code = 200, $headers = [], array $with = [])
+function api_response($data = null, int $status_code = 200, array $headers = [], array $with = [])
 {
     return ResponseService::init()
         ->headers($headers)
-        ->content($content)
+        ->data($data)
         ->with($with)
         ->status($status_code)
         ->response();

tests/ResponseServiceTest.php

@@ -29,7 +29,7 @@ public function testEmpty()
         $this->assertEquals(json_encode(['error' => ['code' => 500, 'data' => null]]), api_response('', 500)->getContent());
     }
 
-    public function testContent()
+    public function testData()
     {
         $this->assertJson(api_response('ok')->getContent());
         $this->assertJson(api_response('fail', 400)->getContent());
@@ -45,7 +45,7 @@ public function testStructure()
         $this->assertJsonStringNotEqualsJsonString(json_encode(['data' => 'ok']), api_response('fail', 400)->getContent());
     }
 
-    public function testWithContent()
+    public function testDataWith()
     {
         $this->assertJson(api_response('ok', 200, [], ['foo' => 'bar'])->getContent());
         $this->assertJson(api_response('fail', 400, [], ['foo' => 'bar'])->getContent());
@@ -64,7 +64,7 @@ public function testWithContent()
         );
     }
 
-    public function testNumberContent()
+    public function testNumber()
     {
         $this->assertEquals(json_encode(['data' => 304]), api_response(304)->getContent());
         $this->assertEquals(json_encode(['error' => ['code' => 400, 'data' => 304]]), api_response(304, 400)->getContent());