Removed FormRequest

Author: Andrey Helldar

.styleci.yml

@@ -1,50 +1,50 @@
 preset: psr2
 
 enabled:
-- align_double_arrow
-- align_equals
-- align_phpdoc
-- blank_line_after_opening_tag
-- blank_line_before_continue
-- blank_line_before_declare
-- blank_line_before_throw
-- blank_line_before_try
-- concat_with_spaces
-- const_separation
-- ereg_to_preg
-- extra_empty_lines
-- lowercase_cast
-- method_separation
-- multiline_array_trailing_comma
-- no_empty_lines_after_phpdocs
-- no_empty_phpdoc
-- no_unused_imports
-- operators_spaces
-- ordered_use
-- phpdoc_indent
-- phpdoc_inline_tag
-- phpdoc_no_access
-- phpdoc_no_package
-- phpdoc_order
-- phpdoc_scalar
-- phpdoc_separation
-- phpdoc_to_comment
-- phpdoc_trim
-- phpdoc_type_to_var
-- phpdoc_types
-- phpdoc_var_without_name
-- property_separation
-- return
-- return_type_declaration
-- self_accessor
-- short_array_syntax
-- short_bool_cast
-- single_quote
-- spaces_after_semicolon
-- spaces_cast
-- standardize_not_equal
-- ternary_spaces
-- trim_array_spaces
-- unary_operators_spaces
-- unneeded_control_parentheses
-- whitespacy_lines
+    - align_double_arrow
+    - align_equals
+    - align_phpdoc
+    - blank_line_after_opening_tag
+    - blank_line_before_continue
+    - blank_line_before_declare
+    - blank_line_before_throw
+    - blank_line_before_try
+    - concat_with_spaces
+    - const_separation
+    - ereg_to_preg
+    - extra_empty_lines
+    - lowercase_cast
+    - method_separation
+    - multiline_array_trailing_comma
+    - no_empty_lines_after_phpdocs
+    - no_empty_phpdoc
+    - no_unused_imports
+    - operators_spaces
+    - ordered_use
+    - phpdoc_indent
+    - phpdoc_inline_tag
+    - phpdoc_no_access
+    - phpdoc_no_package
+    - phpdoc_order
+    - phpdoc_scalar
+    - phpdoc_separation
+    - phpdoc_to_comment
+    - phpdoc_trim
+    - phpdoc_type_to_var
+    - phpdoc_types
+    - phpdoc_var_without_name
+    - property_separation
+    - return
+    - return_type_declaration
+    - self_accessor
+    - short_array_syntax
+    - short_bool_cast
+    - single_quote
+    - spaces_after_semicolon
+    - spaces_cast
+    - standardize_not_equal
+    - ternary_spaces
+    - trim_array_spaces
+    - unary_operators_spaces
+    - unneeded_control_parentheses
+    - whitespacy_lines

README.md

@@ -158,19 +158,9 @@ returned with code 200:
 
 If the first parameter is a number, then the decryption of the error by code will be returned. In other cases, the value of the passed variable will be returned.
 
-### FormRequest for API in Laravel 5+ framework
+### Using in Laravel 5+ framework
 
-You then must change your `Illuminate\Foundation\Http\FormRequest` to extend `Helldar\ApiResponse\Requests\FormRequest` in `app/Http/Requests/*` files:
-
-```php
-use Helldar\ApiResponse\Requests\FormRequest;
-
-class MyRequest extends FormRequest {
-    //
-}
-```
-
-Next, in `app/Exceptions/Handler.php` file change a `render` method to:
+To use you need to add three methods to the file `app/Exceptions/Handler.php`:
 
 ```php
 protected function unauthenticated($request, AuthenticationException $exception)

src/Requests/FormRequest.php

@@ -2,27 +2,7 @@
 
 namespace Helldar\ApiResponse;
 
-use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
-
-class ServiceProvider extends IlluminateServiceProvider
+class ServiceProvider extends Illuminate\Support\ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
-    }
-
-    /**
-     * Register bindings in the container.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+    // 😀
 }

src/ServiceProvider.php

@@ -7,7 +7,7 @@
 class ApiResponseService
 {
     /**
-     * @var string|int|array|object
+     * @var null|string|int|array|object
      */
     protected $content = null;
 
@@ -42,7 +42,7 @@ public function status($status = 200)
     }
 
     /**
-     * @param string|int|array|object $content
+     * @param null|string|int|array|object $content
      *
      * @return $this
      */
@@ -67,8 +67,6 @@ public function headers($headers = [])
 
     /**
      * @return \Symfony\Component\HttpFoundation\JsonResponse
-     *
-     * @deprecated
      */
     public function send()
     {
@@ -103,7 +101,7 @@ protected function setErrorContent()
     }
 
     /**
-     * @return JsonResponse
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function jsonResponse()
     {

src/Services/ApiResponseService.php

@@ -5,8 +5,8 @@
 /**
  * Return a new response from the application.
  *
- * @param null  $content
- * @param int   $status_code
+ * @param null|string|int|array|object $content
+ * @param int $status_code
  * @param array $headers
  *
  * @return \Symfony\Component\HttpFoundation\JsonResponse

src/helpers.php

@@ -11,14 +11,16 @@ public function testInit()
         $this->assertJson(api_response('ok')->getContent());
         $this->assertJson(api_response('fail', 400)->getContent());
 
-        $this->assertJsonStringEqualsJsonString(api_response('ok')->getContent(), json_encode('ok'));
         $this->assertEquals(api_response('ok')->getContent(), json_encode('ok'));
 
         $this->assertEquals(api_response('ok', 401)->getStatusCode(), 401);
         $this->assertEquals(api_response('ok')->getStatusCode(), 200);
+    }
 
+    public function testStructure()
+    {
+        $this->assertJsonStringEqualsJsonString(api_response('ok')->getContent(), json_encode('ok'));
         $this->assertJsonStringEqualsJsonString(api_response('fail', 400)->getContent(), json_encode(['error' => ['code' => 400, 'msg' => 'fail']]));
-
         $this->assertJsonStringNotEqualsJsonString(api_response('fail', 400)->getContent(), json_encode('ok'));
     }
 }