From cf635d5029ae56ac9493fa5dce6a8bf41a4fe0d7 Mon Sep 17 00:00:00 2001
From: ArshiaMohammadei <a.mmdi2007m@gmail.com>
Date: Mon, 26 May 2025 10:29:15 +0330
Subject: [PATCH] Update EntrustPermission.php

Add type hints, improve structure and PHPDoc:

- Typed $auth property as Guard
- Added return and param types to methods
- Used Illuminate\Http\Request for clarity
- Extracted normalizePermissions method
- Used (string) cast for null safety
- Simplified null checks with ??
- Added exception annotations and PHPDoc
---
 src/Entrust/Middleware/EntrustPermission.php | 89 +++++++++++---------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/Entrust/Middleware/EntrustPermission.php b/src/Entrust/Middleware/EntrustPermission.php
index 05f5f910..99f63019 100644
--- a/src/Entrust/Middleware/EntrustPermission.php
+++ b/src/Entrust/Middleware/EntrustPermission.php
@@ -1,4 +1,6 @@
-<?php namespace Zizaco\Entrust\Middleware;
+<?php
+
+namespace Zizaco\Entrust\Middleware;
 
 /**
  * This file is part of Entrust,
@@ -10,44 +12,55 @@
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 
 class EntrustPermission
 {
-	const DELIMITER = '|';
-
-	protected $auth;
-
-	/**
-	 * Creates a new instance of the middleware.
-	 *
-	 * @param Guard $auth
-	 */
-	public function __construct(Guard $auth)
-	{
-		$this->auth = $auth;
-	}
-
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request $request
-	 * @param  Closure $next
-	 * @param  $permissions
-	 * @return mixed
-	 */
-	public function handle($request, Closure $next, $permissions)
-	{
-		if (!is_array($permissions)) {
-    	// Convert $permissions to an empty string if it's null or not a string
-		    $permissions = $permissions ?? '';  
-		    $permissions = explode(self::DELIMITER, $permissions);
-		}
-
-
-		if ($this->auth->guest() || !$request->user()->can($permissions)) {
-			abort(403);
-		}
-
-		return $next($request);
-	}
+    const DELIMITER = '|';
+
+    protected Guard $auth;
+
+    /**
+     * Creates a new instance of the middleware.
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param  Closure  $next
+     * @param  string|array|null  $permissions
+     * @return mixed
+     * 
+     * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+     */
+    public function handle(Request $request, Closure $next, $permissions)
+    {
+        $permissions = $this->normalizePermissions($permissions);
+
+        if ($this->auth->guest() || !$request->user()->can($permissions)) {
+            abort(403);
+        }
+
+        return $next($request);
+    }
+
+    /**
+     * Normalize permissions to array format.
+     *
+     * @param  string|array|null  $permissions
+     * @return array
+     */
+    protected function normalizePermissions($permissions): array
+    {
+        if (is_array($permissions)) {
+            return $permissions;
+        }
+
+        return explode(self::DELIMITER, (string)($permissions ?? ''));
+    }
 }