Better docblocks

Author: dereuromark

src/Auth/AclTrait.php

@@ -290,7 +290,7 @@ protected function _isAuthorizedByPrefix($prefix, array $prefixMap, array $userR
 	 *
 	 * @param array<string> $prefixes
 	 *
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	protected function _normalizePrefixes(array $prefixes) {
 		$normalized = [];
@@ -410,7 +410,7 @@ protected function _parseFiles($paths, $file) {
 	 * Deconstructs an ACL INI section key into a named array with ACL parts.
 	 *
 	 * @param string $key INI section key as found in acl.ini
-	 * @return array Array with named keys for controller, plugin and prefix
+	 * @return array<string, mixed> Array with named keys for controller, plugin and prefix
 	 */
 	protected function _deconstructIniKey($key) {
 		return Utility::deconstructIniKey($key);

src/Auth/AuthUserTrait.php

@@ -171,7 +171,7 @@ public function hasRoles($expectedRoles, $oneRoleIsEnough = true, $providedRoles
 
 	/**
 	 * @param \ArrayAccess|array $identity
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	protected function _toArray(ArrayAccess|array $identity): array {
 		if (is_array($identity)) {

src/Utility/Cache.php

@@ -109,7 +109,7 @@ protected static function assertValidCacheSetup(array $config): void {
 	}
 
 	/**
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	protected static function prepareConfig(): array {
 		$defaultConfig = static::$_defaultConfig;

src/Utility/Utility.php

@@ -11,15 +11,15 @@ class Utility {
 	 * Deconstructs an authentication ini section key into a named array with authentication parts.
 	 *
 	 * @param string $key INI section key as found in authentication.ini
-	 * @return array Array with named keys for controller, plugin and prefix
+	 * @return array<string, mixed> Array with named keys for controller, plugin and prefix
 	 */
 	public static function deconstructIniKey($key) {
 		$res = [
 			'plugin' => null,
 			'prefix' => null,
 		];
 
-		if (strpos($key, '.') !== false) {
+		if (str_contains($key, '.')) {
 			[$res['plugin'], $key] = explode('.', $key);
 		}
 		$lastSlashPos = strrpos($key, '/');