syntax update, phpstan, code style

phpstan/phpstan.neon

@@ -8,7 +8,7 @@ parameters:
 	excludePaths:
 		- %currentWorkingDirectory%/tests/temp/*
 
-	level: 7
+	level: 8
 
 	checkMissingIterableValueType: false
 

src/Compiler.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -17,7 +17,6 @@
  */
 class Compiler
 {
-
 	private IFileCollection $collection;
 	private IOutputNamingConvention $namingConvention;
 	private string $outputDir;
@@ -206,7 +205,9 @@ protected function generateFiles(array $files, array $watchFiles = []): File
 	{
 		$name = $this->namingConvention->getFilename($files, $this);
 		$path = $this->outputDir . '/' . $name;
-		$lastModified = $this->checkLastModified ? $this->getLastModified($watchFiles) : 0;
+		$lastModified = $this->checkLastModified
+			? $this->getLastModified($watchFiles)
+			: 0;
 
 		if (!file_exists($path) || $lastModified > filemtime($path) || $this->debugging === true) {
 			// disabled: https://github.com/nette/safe-stream/pull/5

src/Contract/IBatchCollection.php

@@ -1,10 +1,11 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 
 interface IBatchCollection
 {
 	public function getBatches(): array;
+
 	public function addBatch(string $type, string $name, array $batch): void;
 }

src/Contract/IFileCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 

src/Contract/IOutputNamingConvention.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 

src/Contract/IWebloaderAssetProvider.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 

src/DefaultOutputNamingConvention.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -13,14 +13,13 @@
  */
 class DefaultOutputNamingConvention implements IOutputNamingConvention
 {
-
 	private string $prefix = '';
 	private string $suffix = '';
 
 
 	public static function createCssConvention(): self
 	{
-		$convention = new self();
+		$convention = new self;
 		$convention->setSuffix('.css');
 
 		return $convention;
@@ -29,7 +28,7 @@ public static function createCssConvention(): self
 
 	public static function createJsConvention(): self
 	{
-		$convention = new self();
+		$convention = new self;
 		$convention->setSuffix('.js');
 
 		return $convention;

src/Exception/BatchAlreadyExistsException.php

@@ -1,9 +1,8 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
-use WebLoader\Exception\WebLoaderException;
 
 class BatchAlreadyExistsException extends WebLoaderException
 {

src/Exception/CompilationException.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 

src/Exception/FileNotFoundException.php

@@ -1,10 +1,9 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
-use WebLoader\Exception\WebLoaderException;
 
 /**
  * FileNotFoundException

src/Exception/InvalidArgumentException.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 

src/Exception/WebLoaderException.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 

src/File.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 

src/FileCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -16,16 +16,13 @@
  */
 class FileCollection implements IFileCollection
 {
-
-	private string $root;
 	private array $files = [];
 	private array $watchFiles = [];
 	private array $remoteFiles = [];
 
 
-	public function __construct(?string $root = null)
+	public function __construct(private string $root)
 	{
-		$this->root = (string) $root;
 	}
 
 

src/Filter/CssMinFilter.php

@@ -8,7 +8,6 @@
 
 class CssMinFilter
 {
-
 	public function __invoke(string $code, Compiler $compiler, string $file = ''): string
 	{
 		$minifier = new Minifier;

src/Filter/CssUrlsFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -16,20 +16,18 @@
  */
 class CssUrlsFilter
 {
-
-	protected string $basePath;
 	private string $docRoot;
 
 
-	public function __construct(string $docRoot, string $basePath = '/')
-	{
+	public function __construct(
+		string $docRoot,
+		protected string $basePath = '/'
+	) {
 		$this->docRoot = Path::normalize($docRoot);
 
 		if (!is_dir($this->docRoot)) {
 			throw new InvalidArgumentException('Given document root is not directory.');
 		}
-
-		$this->basePath = $basePath;
 	}
 
 
@@ -109,9 +107,7 @@ public function __invoke(string $code, Compiler $loader, ?string $file = null):
 
 		$self = $this;
 
-		$return = preg_replace_callback($regexp, function ($matches) use ($self, $file) {
-			return "url('" . $self->absolutizeUrl($matches[2], $matches[1], $file) . "')";
-		}, $code);
+		$return = preg_replace_callback($regexp, fn($matches) => "url('" . $self->absolutizeUrl($matches[2], $matches[1], $file) . "')", $code);
 
 		return (string) $return;
 	}

src/Filter/LessBinFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,14 +14,11 @@
  */
 class LessBinFilter
 {
-
-	private string $bin;
 	private array $env;
 
 
-	public function __construct(string $bin = 'lessc', array $env = [])
+	public function __construct(private string $bin = 'lessc', array $env = [])
 	{
-		$this->bin = $bin;
 		$this->env = $env + $_ENV;
 		unset($this->env['argv'], $this->env['argc']);
 	}

src/Filter/Process.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -19,8 +19,7 @@ public static function run(
 		?string $stdin = null,
 		?string $cwd = null,
 		?array $env = null
-	): string
-	{
+	): string {
 		$descriptorspec = [
 			0 => ['pipe', 'r'], // stdin
 			1 => ['pipe', 'w'], // stdout

src/Filter/ScssFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -15,21 +15,16 @@
  */
 class ScssFilter
 {
-
-	private ?ScssCompiler $sc;
-
-
-	public function __construct(?ScssCompiler $sc = null)
+	public function __construct(private ?ScssCompiler $sc = null)
 	{
-		$this->sc = $sc;
 	}
 
 
 	private function getScssC(): ScssCompiler
 	{
 		// lazy loading
 		if (empty($this->sc)) {
-			$this->sc = new ScssCompiler();
+			$this->sc = new ScssCompiler;
 		}
 
 		return $this->sc;

src/Filter/StylusFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,15 +14,12 @@
  */
 class StylusFilter
 {
-
 	public bool $compress = false;
 	public bool $includeCss = false;
-	private string $bin;
 
 
-	public function __construct(string $bin = 'stylus')
+	public function __construct(private string $bin = 'stylus')
 	{
-		$this->bin = $bin;
 	}
 
 

src/Filter/TypeScriptFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,14 +14,11 @@
  */
 class TypeScriptFilter
 {
-
-	private ?string $bin;
 	private ?array $env;
 
 
-	public function __construct(string $bin = 'tsc', array $env = [])
+	public function __construct(private string $bin = 'tsc', array $env = [])
 	{
-		$this->bin = $bin;
 		$this->env = $env + $_ENV;
 		unset($this->env['argv'], $this->env['argc']);
 	}