PHP 8 compatibility.

Author: janbarasek

composer.json

@@ -17,19 +17,21 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2",
+		"php": "^8.0",
 		"mathematicator-core/tokenizer": "^2.1",
 		"mathematicator-core/engine": "^2.0",
 		"mathematicator-core/numbers": "^2.1"
 	},
 	"require-dev": {
-		"brainmaestro/composer-git-hooks": "dev-master",
-		"nette/bootstrap": "^3.0",
-		"nette/tester": "^2.3",
 		"phpstan/phpstan": "^0.12.74",
+		"tracy/tracy": "^2.8",
 		"phpstan/phpstan-nette": "^0.12.14",
 		"spaze/phpstan-disallowed-calls": "^1.1",
-		"roave/security-advisories": "dev-master"
+		"roave/security-advisories": "dev-master",
+		"jetbrains/phpstorm-attributes": "^1.0",
+		"brainmaestro/composer-git-hooks": "dev-master",
+		"nette/bootstrap": "^3.0",
+		"nette/tester": "^2.3"
 	},
 	"autoload": {
 		"psr-4": {

src/IntegralResult.php

@@ -12,22 +12,18 @@ final class IntegralResult
 {
 
 	/** @var IToken[] */
-	private $queryTokens;
+	private array $queryTokens;
 
-	/** @var string */
-	private $queryLaTeX;
+	private string $queryLaTeX;
 
-	/** @var string|null */
-	private $result;
+	private ?string $result = null;
 
-	/** @var string */
-	private $differential;
+	private string $differential;
 
-	/** @var bool */
-	private $singleToken;
+	private bool $singleToken;
 
 	/** @var Step[] */
-	private $steps = [];
+	private array $steps = [];
 
 
 	/**
@@ -44,7 +40,7 @@ public function __construct(array $queryTokens, string $queryLaTeX, string $diff
 
 	public function isFinalResult(): bool
 	{
-		return strpos($this->getResult(), '?') === false;
+		return str_contains($this->getResult(), '?') === false;
 	}
 
 

src/IntegralSolver.php

@@ -16,7 +16,6 @@
 use Mathematicator\Tokenizer\Token\SubToken;
 use Mathematicator\Tokenizer\Token\VariableToken;
 use Mathematicator\Tokenizer\Tokenizer;
-use Nette\Tokenizer\Exception;
 
 /**
  * This class is user interface for call inner integral logic.
@@ -29,16 +28,13 @@ class IntegralSolver
 {
 
 	/** @var IRule[] */
-	public $rules = [];
+	public array $rules = [];
 
-	/** @var Tokenizer */
-	private $tokenizer;
+	private Tokenizer $tokenizer;
 
-	/** @var QueryNormalizer */
-	private $queryNormalizer;
+	private QueryNormalizer $queryNormalizer;
 
-	/** @var Solver */
-	private $solver;
+	private Solver $solver;
 
 
 	public function __construct(Tokenizer $tokenizer, QueryNormalizer $queryNormalizer, Solver $solver)
@@ -66,7 +62,6 @@ public function process(string $query, ?string $differential = null): IntegralRe
 
 	/**
 	 * @param IToken[] $tokens
-	 * @return IntegralResult
 	 * @throws MathematicatorException
 	 */
 	public function processByTokens(array $tokens, ?string $differential = null): IntegralResult
@@ -117,7 +112,7 @@ public function processByTokens(array $tokens, ?string $differential = null): In
 			} else {
 				$result->addStep(new Step('Přibližné řešení', $resultLaTeX, 'Nepodařilo se najít primitivní funkci, řešení je zobrazeno přibližně.'));
 			}
-		} catch (Exception $e) {
+		} catch (\Throwable) {
 			$result->addStep(new Step('Řešení', null, 'Řešení se nepodařilo vykreslit.'));
 		}
 
@@ -171,7 +166,6 @@ private function explodeToParts(array $tokens): array
 
 	/**
 	 * @param IToken[] $tokens
-	 * @return string
 	 */
 	private function resolveDifferential(array $tokens, ?string $preferenceDifferential = null, int $level = 0): string
 	{

src/Solver/Solver.php

@@ -15,7 +15,6 @@ final class Solver
 {
 	/**
 	 * @param IToken[] $tokens
-	 * @return string
 	 * @throws CanNotSolveException|MathematicatorException
 	 */
 	public function solvePart(array $tokens): string