Fix SA

Author: MGatner

composer.json

@@ -21,7 +21,7 @@
 		}
 	],
 	"require": {
-		"php": "^7.3 || ^8.0"
+		"php": "^7.3||^8.0"
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4": "dev-develop",

src/Libraries/Assets.php

@@ -28,6 +28,7 @@
 use CodeIgniter\Config\Config;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollectionInterface;
+use Tatter\Assets\Config\Assets as AssetsConfig;
 use Tatter\Assets\Exceptions\AssetsException;
 
 /*** CLASS ***/
@@ -36,14 +37,14 @@ class Assets
 	/**
 	 * Our configuration instance.
 	 *
-	 * @var \Tatter\Assets\Config\Assets
+	 * @var AssetsConfig
 	 */
 	protected $config;
 
 	/**
 	 * Array of asset paths detected for the current route
 	 *
-	 * @var array
+	 * @var array|null
 	 */
 	protected $paths;
 
@@ -61,7 +62,7 @@ class Assets
 	 * The URI to use for matching routed assets.
 	 * Defaults to uri_string()
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $route;
 
@@ -76,7 +77,7 @@ class Assets
 	/**
 	 * Route collection used to determine the default route (if needed).
 	 *
-	 * @var CodeIgniter\Router\RouteCollectionInterface
+	 * @var RouteCollectionInterface|null
 	 */
 	protected $collection;
 
@@ -147,7 +148,7 @@ public function getPaths($extension = null): array
 		$tmpPaths = [];
 		foreach ($this->paths as $path)
 		{
-			if (strtolower(pathinfo($path, PATHINFO_EXTENSION) == $extension))
+			if (strtolower(pathinfo($path, PATHINFO_EXTENSION)) == $extension)
 			{
 				$tmpPaths[] = $path;
 			}
@@ -197,16 +198,13 @@ public function tag(string $path)
 		{
 			case 'css':
 				return link_tag($url);
-			break;
 
 			case 'js':
 				return script_tag($url);
-			break;
 
 			case 'img':
 				$alt = ucfirst(pathinfo($path, PATHINFO_FILENAME));
 				return img($url, false, ['alt' => $alt]);
-			break;
 
 			default:
 				if ($this->config->silent)
@@ -281,7 +279,7 @@ protected function sanitizeRoute()
 		if (Config::get('App')->negotiateLocale)
 		{
 			$route = explode('/', $this->route);
-			if (count($route) && $route[0] == Services::request()->getLocale())
+			if (count($route) && $route[0] == Services::request()->getLocale()) // @phpstan-ignore-line
 			{
 				unset($route[0]);
 			}

src/Libraries/Manifests.php

@@ -4,6 +4,7 @@
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Tatter\Assets\Exceptions\ManifestsException;
+use stdClass;
 
 class Manifests
 {
@@ -294,7 +295,14 @@ public function expandPaths(&$resource, &$manifest)
 			trim($resource->destination ?? '', '/') . '/';
 	}
 
-	// Parse a resource and copy it to the determined destination
+	/**
+	 * Parses a resource and copies it to
+	 * the determined destination.
+	 *
+	 * @param stdClass $resource
+	 *
+	 * @return bool
+	 */
 	protected function publishResource($resource): bool
 	{
 		// Validate the source
@@ -327,7 +335,15 @@ protected function publishResource($resource): bool
 		return $this->publishFile($resource->source, $resource->destination);
 	}
 
-	// Scan a directory and apply filters, publishing each file
+
+	/**
+	 * Scans a directory and applies filters,
+	 * publishing each file.
+	 *
+	 * @param stdClass $resource
+	 *
+	 * @return bool
+	 */
 	protected function publishResourceDirectory($resource): bool
 	{
 		$result = true;

tests/_support/ManifestsTestCase.php

@@ -1,21 +1,34 @@
 <?php namespace Tests\Support;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Tatter\Assets\Config\Assets as AssetsConfig;
 use Tatter\Assets\Libraries\Manifests;
 use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+use stdClass;
 
 class ManifestsTestCase extends CIUnitTestCase
 {
 	/**
-	 * @var \Tatter\Assets\Libraries\Manifests
+	 * @var vfsStreamDirectory|null
+	 */
+	protected $root;
+
+	/**
+	 * @var Manifests
 	 */
 	protected $manifests;
 
 	/**
-	 * @var \Tatter\Assets\Config\Assets
+	 * @var AssetsConfig
 	 */
 	protected $config;
 
+	/**
+	 * @var stdClass
+	 */
+	protected $testManifest;
+
     public function setUp(): void
     {
         parent::setUp();

tests/manifests/PublishTest.php

@@ -34,7 +34,7 @@ public function testExplicitFiles()
 		];
 
 		$visitor = new vfsStreamStructureVisitor();
-		$result  = vfsStream::inspect($visitor, $this->root)->getStructure();
+		$result  = vfsStream::inspect($visitor, $this->root)->getStructure(); // @phpstan-ignore-line
 
 		$this->assertEquals($expected, $result);
 	}
@@ -48,7 +48,7 @@ public function testRecursiveFlatten()
 		$this->assertTrue($result);
 
 		$visitor = new vfsStreamStructureVisitor();
-		$result  = vfsStream::inspect($visitor, $this->root)->getStructure();
+		$result  = vfsStream::inspect($visitor, $this->root)->getStructure(); // @phpstan-ignore-line
 
 		$this->assertTrue($this->root->hasChild('assets/vendor/frontend/frontend.css'));
 		$this->assertTrue($this->root->hasChild('assets/vendor/frontend/frontend.js'));