Updated dependencies + PHP8

README.md

@@ -38,8 +38,8 @@ For details on how to use this package, check out our [documentation](.docs).
 
 | State  | Version  | Branch   | Nette  | PHP     |
 |--------|----------|----------|--------|---------|
-| dev    | `^4.0.0` | `master` | `3.0+` | `>=7.2` |
-| stable | `^3.0.0` | `master` | `3.0+` | `>=7.1` |
+| dev    | `^5.0.0` | `master` | `3.0+` | `>=8.0` |
+| stable | `^4.0.0` | `master` | `3.0+` | `>=8.0` |
 
 ## Development
 

composer.json

@@ -36,14 +36,14 @@
 		}
 	},
 	"require": {
-		"php": ">= 7.2.0",
-		"erusev/parsedown": "^1.6",
+		"php": ">= 8.0",
+		"erusev/parsedown": "^1.7",
 		"symfony/console": "^5.0|^6.0",
 		"matthiasmullie/minify": "^1.3",
 		"nette/utils": "^3.0"
 	},
 	"require-dev": {
-		"nette/tester": "^2.3",
+		"nette/tester": "^2.4",
 		"mockery/mockery": "^1.0",
 		"contributte/code-rules": "^1.1"
 	},
@@ -54,7 +54,12 @@
 	"prefer-stable": true,
 	"extra": {
 		"branch-alias": {
-			"dev-master": "4.0.x-dev"
+			"dev-master": "5.0.x-dev"
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
 		}
 	}
 }

src/Console/Utils/Logger.php

@@ -9,16 +9,7 @@
 final class Logger
 {
 
-	/**
-	 * @var OutputInterface
-	 */
-	private $output;
-
-
-	public function __construct(OutputInterface $output)
-	{
-		$this->output = $output;
-	}
+	public function __construct(private OutputInterface $output) {}
 
 
 	public function logProcessingFile(string $path): void

src/Console/Utils/ParamsValidator.php

@@ -10,16 +10,7 @@
 final class ParamsValidator
 {
 
-	/**
-	 * @var string
-	 */
-	private $binDir;
-
-
-	public function __construct(string $binDir)
-	{
-		$this->binDir = $binDir;
-	}
+	public function __construct(private string $binDir) {}
 
 
 	/**

src/Generator/Assets.php

@@ -36,14 +36,9 @@ final class Assets
 	 */
 	private $layoutFavicon;
 
-	/**
-	 * @var AuthCredentials
-	 */
-	private $authCredentials;
-
 
 	public function __construct(
-		AuthCredentials $authCredentials,
+		private AuthCredentials $authCredentials,
 		?string $addCss
 	) {
 		$this->layoutFile = __DIR__ . '/../../assets/layout.php';
@@ -62,8 +57,6 @@ public function __construct(
 			__DIR__ . '/../../assets/layout.js',
 		];
 		$this->layoutFavicon = __DIR__ . '/../../assets/favicon.ico';
-
-		$this->authCredentials = $authCredentials;
 	}
 
 

src/Generator/DocuGenerator.php

@@ -14,38 +14,19 @@
 final class DocuGenerator
 {
 
-	/**
-	 * @var string
-	 */
-	private $inputDirectory;
-
-	/**
-	 * @var string
-	 */
-	private $outputDirectory;
-
-	/**
-	 * @var AuthCredentials
-	 */
-	private $authCredentials;
-
 	/**
 	 * @var Parser
 	 */
 	private $parser;
 
 
 	public function __construct(
-		string $inputDirectory,
-		string $outputDirectory,
+		private string $inputDirectory,
+		private string $outputDirectory,
 		?string $addCss,
-		AuthCredentials $authCredentials,
+		private AuthCredentials $authCredentials,
 		Logger $logger
 	) {
-		$this->inputDirectory = $inputDirectory;
-		$this->outputDirectory = $outputDirectory;
-		$this->authCredentials = $authCredentials;
-
 		$this->parser = new Parser(
 			true,
 			$authCredentials,

src/Http/AuthCredentials.php

@@ -7,22 +7,7 @@
 final class AuthCredentials
 {
 
-	/**
-	 * @var string|null
-	 */
-	private $user;
-
-	/**
-	 * @var string|null
-	 */
-	private $pass;
-
-
-	public function __construct(?string $user, ?string $pass)
-	{
-		$this->user = $user;
-		$this->pass = $pass;
-	}
+	public function __construct(private ?string $user, private ?string $pass) {}
 
 
 	public function getUser(): ?string

src/Markdown/DocuScope.php

@@ -9,11 +9,6 @@
 final class DocuScope
 {
 
-	/**
-	 * @var string
-	 */
-	private $outputDirectory;
-
 	/**
 	 * @var string[]
 	 */
@@ -25,10 +20,7 @@ final class DocuScope
 	private $blockVariables = [];
 
 
-	public function __construct(string $outputDirectory)
-	{
-		$this->outputDirectory = $outputDirectory;
-	}
+	public function __construct(private string $outputDirectory) {}
 
 
 	public function getOutputDirectory(): string

src/Markdown/Macro/AbstractMacroVariable.php

@@ -12,16 +12,8 @@ abstract class AbstractMacroVariable
 
 	protected const MAX_EXECUTE_DEPTH = 3;
 
-	/**
-	 * @var DocuScope
-	 */
-	protected $docuScope;
-
 
-	public function __construct(DocuScope $docuScope)
-	{
-		$this->docuScope = $docuScope;
-	}
+	public function __construct(protected DocuScope $docuScope) {}
 
 
 	/**

src/Markdown/Macro/Index/AbstractIndexSection.php

@@ -14,16 +14,8 @@ abstract class AbstractIndexSection implements IIndexSection
 	 */
 	protected static $pattern = '/.+/';
 
-	/**
-	 * @var string
-	 */
-	private $contentString;
 
-
-	final private function __construct(string $contentString)
-	{
-		$this->contentString = $contentString;
-	}
+	final private function __construct(private string $contentString) {}
 
 
 	/**

src/Markdown/Macro/MacroInlineFileLink.php

@@ -14,20 +14,14 @@ final class MacroInlineFileLink implements IMacro
 
 	private const LINK_PATTERN = '/\[((?:[^][]++|(?R))*+)\]\(([^\)]*)\)/um';
 
-	/**
-	 * @var DocuScope
-	 */
-	private $docuScope;
-
 	/**
 	 * @var callable
 	 */
 	private $fileHashAlgo;
 
 
-	public function __construct(DocuScope $docuScope, ?callable $fileHashAlgo = null)
+	public function __construct(private DocuScope $docuScope, ?callable $fileHashAlgo = null)
 	{
-		$this->docuScope = $docuScope;
 		$this->fileHashAlgo = $fileHashAlgo ?? [FileHash::class, 'md5File'];
 	}
 

src/Markdown/Macro/MacroSection.php

@@ -18,19 +18,12 @@ final class MacroSection implements IMacro
 	 */
 	private $parser;
 
-	/**
-	 * @var AuthCredentials
-	 */
-	private $authCredentials;
-
 
 	public function __construct(
 		Logger $logger,
-		AuthCredentials $authCredentials,
+		private AuthCredentials $authCredentials,
 		DocuScope $docuScope
 	) {
-		$this->authCredentials = $authCredentials;
-
 		$this->parser = new Parser(false, $authCredentials, $logger, $docuScope, null);
 	}
 

src/Markdown/Parser.php

@@ -23,26 +23,6 @@
 final class Parser
 {
 
-	/**
-	 * @var bool
-	 */
-	private $isLayout;
-
-	/**
-	 * @var AuthCredentials
-	 */
-	private $authCredentials;
-
-	/**
-	 * @var Logger
-	 */
-	private $logger;
-
-	/**
-	 * @var DocuScope
-	 */
-	private $docuScope;
-
 	/**
 	 * @var CustomParsedown
 	 */
@@ -60,17 +40,12 @@ final class Parser
 
 
 	public function __construct(
-		bool $isLayout,
-		AuthCredentials $authCredentials,
-		Logger $logger,
-		DocuScope $docuScope,
+		private bool $isLayout,
+		private AuthCredentials $authCredentials,
+		private Logger $logger,
+		private DocuScope $docuScope,
 		?string $addCss
 	) {
-		$this->isLayout = $isLayout;
-		$this->authCredentials = $authCredentials;
-		$this->logger = $logger;
-		$this->docuScope = $docuScope;
-
 		$this->parsedown = new CustomParsedown;
 		$this->assets = new Assets($authCredentials, $addCss);