feat: Adiciona resumo das correções do PHPStan e atualiza namespaces para PivotPHP

Author: CAFernandes

PHPSTAN_FIXES_SUMMARY.md

@@ -0,0 +1,39 @@
+# PHPStan Fixes Summary
+
+This document summarizes the changes made to fix PHPStan errors in the pivotphp-cycle-orm project.
+
+## Issues Fixed
+
+1. **Private/Protected Property Access**: Fixed direct access to private properties of `PivotPHP\Core\Http\Request`
+2. **Type Mismatch**: Resolved issues with `CycleRequest` vs `Request` type compatibility
+3. **Namespace References**: Updated old `Helix` namespace references to `PivotPHP\Core`
+
+## Files Modified
+
+### 1. `/src/Health/HealthCheckMiddleware.php`
+- Replaced direct property access (`$req->path`, `$req->pathCallable`) with public method `$req->getPathCallable()`
+- Replaced direct query property access (`$req->query`) with public method `$req->get('detailed', false)`
+- Fixed code style issue (removed space before semicolon)
+
+### 2. `/src/Middleware/CycleMiddleware.php`
+- Changed middleware to pass the original `Request` object instead of `CycleRequest` wrapper
+- Added `cycleRequest` as an attribute on the original request for compatibility
+- This ensures type compatibility with the middleware chain
+
+### 3. `/src/Middleware/TransactionMiddleware.php`
+- Removed `CycleRequest` type hints, now only accepts `Request`
+- Removed unused `CycleRequest` import
+- Updated `getRouteInfo()` method to use public methods `$req->getMethod()` and `$req->getPathCallable()`
+- Simplified middleware logic by removing CycleRequest instance checks
+
+### 4. `/phpstan.neon`
+- Removed obsolete `Helix\Http\Request` ignore pattern
+- Updated `universalObjectCratesClasses` from `Helix\*` to `PivotPHP\Core\*` namespaces
+
+## Result
+
+All PHPStan errors have been resolved. The code now:
+- Passes PHPStan analysis at Level 9 (highest level)
+- Adheres to PSR-12 coding standards
+- Properly uses public API methods instead of accessing private properties
+- Has consistent type handling throughout the middleware chain

phpstan.neon

@@ -7,15 +7,9 @@ parameters:
         - tests
     bootstrapFiles:
         - vendor/autoload.php
-    ignoreErrors:
-        - '#Parameter \#1 of callable .* expects Helix\\Http\\Request, .* given#'
 
     # PivotPHP specific ignores
     universalObjectCratesClasses:
-        - Helix\Http\Request
-        - Helix\Http\Response
-        - Helix\Core\Application
-
-    # Stub files for better type inference
-    # stubFiles:
-    #     - ../pivotphp-core/src/Http/Request.php
+        - PivotPHP\Core\Http\Request
+        - PivotPHP\Core\Http\Response
+        - PivotPHP\Core\Core\Application

src/CycleServiceProvider.php

@@ -373,7 +373,7 @@ private function registerMigrator(): void
             'cycle.migrator',
             function () {
                 // Retorna um migrator básico ou mock para desenvolvimento
-                return new class() {
+                return new class () {
                     /**
                      * @return array{pending: array<int, mixed>, executed: array<int, mixed>}
                      */

src/Exceptions/CycleException.php

@@ -2,4 +2,6 @@
 
 namespace PivotPHP\CycleORM\Exceptions;
 
-class CycleORMException extends \Exception {}
+class CycleORMException extends \Exception
+{
+}

src/Health/HealthCheckMiddleware.php

@@ -20,16 +20,8 @@ public function __construct(Application $app)
 
     public function handle(Request $req, Response $res, callable $next): void
     {
-        // Compatível com PivotPHP: prioriza getPathInfo(), depois path, depois pathCallable
-        if (method_exists($req, 'getPathInfo') && is_callable([$req, 'getPathInfo'])) {
-            $path = $req->getPathInfo();
-        } elseif (property_exists($req, 'path')) {
-            $path = $req->path;
-        } elseif (property_exists($req, 'pathCallable')) {
-            $path = $req->pathCallable;
-        } else {
-            $path = null;
-        }
+        // Use the public method getPathCallable() to get the actual request path
+        $path = $req->getPathCallable();
 
         // Verificar se é uma requisição de health check
         if ('/health/cycle' === $path || '/health' === $path) {
@@ -43,7 +35,7 @@ public function handle(Request $req, Response $res, callable $next): void
 
     private function handleHealthCheck(Request $req, Response $res): void
     {
-        $detailed = (is_array($req->query) && isset($req->query['detailed'])) ? $req->query['detailed'] : false;
+        $detailed = $req->get('detailed', false);
 
         if ($detailed) {
             $health = CycleHealthCheck::detailedCheck($this->app);
@@ -56,7 +48,6 @@ private function handleHealthCheck(Request $req, Response $res): void
         $res->status($statusCode)
             ->header('Content-Type', 'application/json')
             ->header('Cache-Control', 'no-cache, no-store, must-revalidate')
-            ->json($health)
-        ;
+            ->json($health);
     }
 }

src/Helpers/CycleHelpers.php

@@ -84,8 +84,7 @@ public static function applyFilters(object $query, array $filters, array $allowe
                     )
                 ) {
                     $query = $query->where($field, '>=', $matches[1])
-                        ->where($field, '<=', $matches[2])
-                    ;
+                        ->where($field, '<=', $matches[2]);
                 } else {
                     $query = $query->where($field, $value);
                 }

src/Middleware/CycleMiddleware.php

@@ -66,7 +66,9 @@ public function handle(Request $req, Response $res, callable $next): void
             $cycleRequest->db = $db;
         }
 
-        // Passa o CycleRequest wrapper para o próximo handler
-        $next($cycleRequest, $res);
+        // Pass the original request to maintain compatibility with the next handler
+        // The CycleRequest wrapper can be accessed through the original request's attributes
+        $req->setAttribute('cycleRequest', $cycleRequest);
+        $next($req, $res);
     }
 }

src/Middleware/TransactionMiddleware.php

@@ -3,7 +3,6 @@
 namespace PivotPHP\CycleORM\Middleware;
 
 use PivotPHP\Core\Core\Application;
-use PivotPHP\CycleORM\Http\CycleRequest;
 use PivotPHP\Core\Http\Request;
 use PivotPHP\Core\Http\Response;
 
@@ -21,7 +20,7 @@ public function __construct(Application $app)
      *
      * @param callable(Request, Response):void $next função next do PivotPHP
      */
-    public function __invoke(CycleRequest|Request $req, Response $res, callable $next): void
+    public function __invoke(Request $req, Response $res, callable $next): void
     {
         $this->handle($req, $res, $next);
     }
@@ -31,7 +30,7 @@ public function __invoke(CycleRequest|Request $req, Response $res, callable $nex
      *
      * @param callable(Request, Response):void $next função next do PivotPHP, recebe Request e Response
      */
-    public function handle(CycleRequest|Request $req, Response $res, callable $next): void
+    public function handle(Request $req, Response $res, callable $next): void
     {
         // Use sempre o container PSR-11 para buscar serviços
         if (method_exists($this->app, 'getContainer')) {
@@ -55,13 +54,8 @@ public function handle(CycleRequest|Request $req, Response $res, callable $next)
             $transactionStarted = true;
             $this->logDebug('Transaction started for route: ' . $this->getRouteInfo($req));
 
-            // If we have a CycleRequest, pass the original request to the next middleware
-            // to ensure compatibility with the route handler
-            if ($req instanceof CycleRequest) {
-                $next($req->getOriginalRequest(), $res);
-            } else {
-                $next($req, $res);
-            }
+            // Pass the request to the next middleware
+            $next($req, $res);
 
             // Commit apenas se há mudanças
             if (is_object($em) && method_exists($em, 'commitTransaction')) {
@@ -85,20 +79,10 @@ public function handle(CycleRequest|Request $req, Response $res, callable $next)
         }
     }
 
-    private function getRouteInfo(CycleRequest|Request $req): string
+    private function getRouteInfo(Request $req): string
     {
-        $method = property_exists($req, 'method')
-            && (is_string($req->method) || is_numeric($req->method))
-            ? (string) $req->method
-            : 'Unknown';
-
-        $uri = property_exists($req, 'pathCallable')
-            && (is_string($req->pathCallable) || is_numeric($req->pathCallable))
-            ? (string) $req->pathCallable
-            : (property_exists($req, 'path')
-                && (is_string($req->path) || is_numeric($req->path))
-                ? (string) $req->path
-                : 'Unknown');
+        $method = $req->getMethod();
+        $uri = $req->getPathCallable();
 
         return "{$method} {$uri}";
     }

tests/Feature/CycleRequestTest.php

@@ -38,8 +38,7 @@ public function testMethodForwarding(): void
         $this->originalRequest
             ->expects($this->once())
             ->method('getMethod')
-            ->willReturn('POST')
-        ;
+            ->willReturn('POST');
 
         // Call should be forwarded to original request
         $result = $this->cycleRequest->getMethod();

tests/Feature/MonitoringTest.php

@@ -292,7 +292,7 @@ private function createApplication(): Application
         $container->bind(
             'config',
             function () {
-                return new class() {
+                return new class () {
                     public function get(string $key, mixed $default = null): mixed
                     {
                         return match ($key) {