apply code suggestions

Co-authored-by: John Paul E. Balandan, CPA <paulbalandan@gmail.com>

Author: michalsn

system/Commands/Generators/Views/formrequest.tpl.php

@@ -31,7 +31,7 @@ public function rules(): array
     // /**
     //  * Determines if the current user is authorized to make this request.
     //  */
-    // public function authorize(): bool
+    // public function isAuthorized(): bool
     // {
     //     return true;
     // }

system/HTTP/FormRequest.php

@@ -13,7 +13,6 @@
 
 namespace CodeIgniter\HTTP;
 
-use CodeIgniter\Exceptions\RuntimeException;
 use ReflectionNamedType;
 use ReflectionParameter;
 
@@ -36,22 +35,12 @@ abstract class FormRequest
 
     /**
      * When called by the framework, the current IncomingRequest is injected
-     * explicitly. When instantiated manually (e.g. in tests or commands),
-     * the constructor falls back to service('request').
-     *
-     * @throws RuntimeException if used outside of an HTTP request context.
+     * explicitly. When instantiated manually (e.g. in tests), the constructor
+     * falls back to service('request').
      */
     final public function __construct(?IncomingRequest $request = null)
     {
-        $resolved = $request ?? service('request');
-
-        if (! $resolved instanceof IncomingRequest) {
-            throw new RuntimeException(
-                static::class . ' requires an IncomingRequest instance, got ' . $resolved::class . '.',
-            );
-        }
-
-        $this->request = $resolved;
+        $this->request = $request ?? service('request');
     }
 
     /**
@@ -88,12 +77,12 @@ public function messages(): array
      *
      * Override in subclasses to add authorization logic:
      *
-     *  public function authorize(): bool
+     *  public function isAuthorized(): bool
      *  {
      *      return auth()->user()->can('create-posts');
      *  }
      */
-    public function authorize(): bool
+    public function isAuthorized(): bool
     {
         return true;
     }
@@ -164,7 +153,7 @@ protected function failedValidation(array $errors): ResponseInterface
     }
 
     /**
-     * Called when the authorize() check returns false. Override to customize.
+     * Called when the isAuthorized() check returns false. Override to customize.
      */
     protected function failedAuthorization(): ResponseInterface
     {
@@ -261,7 +250,7 @@ protected function validationData(): array
      */
     final public function resolveRequest(): ?ResponseInterface
     {
-        if (! $this->authorize()) {
+        if (! $this->isAuthorized()) {
             return $this->failedAuthorization();
         }
 

tests/_support/HTTP/Requests/UnauthorizedFormRequest.php

@@ -25,7 +25,7 @@ public function rules(): array
         return ['title' => 'required'];
     }
 
-    public function authorize(): bool
+    public function isAuthorized(): bool
     {
         return false;
     }

tests/system/HTTP/FormRequestTest.php

@@ -119,7 +119,7 @@ public function testDefaultAuthorizeReturnsTrue(): void
     {
         $formRequest = $this->makeFormRequest($this->makeRequest());
 
-        $this->assertTrue($formRequest->authorize());
+        $this->assertTrue($formRequest->isAuthorized());
     }
 
     public function testValidatedReturnsEmptyArrayBeforeResolution(): void
@@ -338,7 +338,7 @@ public function rules(): array
                 return [];
             }
 
-            public function authorize(): bool
+            public function isAuthorized(): bool
             {
                 return false;
             }
@@ -364,7 +364,7 @@ public function rules(): array
                 return ['title' => 'required'];
             }
 
-            public function authorize(): bool
+            public function isAuthorized(): bool
             {
                 self::$order[] = 'authorize';
 
@@ -381,7 +381,7 @@ protected function prepareForValidation(array $data): array
 
         $formRequest->resolveRequest();
 
-        // authorize() must fire before prepareForValidation(); validation never runs.
+        // isAuthorized() must fire before prepareForValidation(); validation never runs.
         $this->assertSame(['authorize'], $formRequest::$order);
     }
 
@@ -443,7 +443,7 @@ public function rules(): array
                 return [];
             }
 
-            public function authorize(): bool
+            public function isAuthorized(): bool
             {
                 return false;
             }

user_guide_src/source/incoming/form_requests.rst

@@ -131,14 +131,14 @@ identical to the ``$errors`` argument of :ref:`saving-validation-rules-to-config
 Authorization
 *************
 
-Override ``authorize()`` to control whether the current user is allowed to make
+Override ``isAuthorized()`` to control whether the current user is allowed to make
 this request. Return ``false`` to reject the request with a 403 Forbidden
 response before validation even runs.
 
 .. literalinclude:: form_requests/005.php
    :lines: 2-
 
-.. note:: The ``authorize()`` check runs before ``prepareForValidation()`` and
+.. note:: The ``isAuthorized()`` check runs before ``prepareForValidation()`` and
     before validation itself. An unauthorized request never reaches the
     validation stage.
 
@@ -223,7 +223,7 @@ whose type extends ``FormRequest``:
 
 #. A new instance is created with the current request injected via the
    constructor.
-#. ``authorize()`` is called. If it returns ``false``, ``failedAuthorization()``
+#. ``isAuthorized()`` is called. If it returns ``false``, ``failedAuthorization()``
    is called, and its response is returned to the client.
 #. ``validationData()`` collects the data to validate.
 #. ``prepareForValidation()`` receives that data and may modify it before the

user_guide_src/source/incoming/form_requests/005.php

@@ -14,7 +14,7 @@ public function rules(): array
         ];
     }
 
-    public function authorize(): bool
+    public function isAuthorized(): bool
     {
         // Only authenticated users may submit posts.
         return auth()->loggedIn();