Merge pull request #217 from phpcr/cleanup-major

drop workarounds for symfony 2
phpcr · Nov 28, 2023 · 4ee2510 · 4ee2510
2 parents 2e6df65 + ec608ad
commit 4ee2510
Show file tree

Hide file tree

Showing 102 changed files with 1,134 additions and 1,668 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -17,11 +17,8 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: '7.2'
-                      dependencies: 'lowest'
-                    - php-version: '7.3'
-                    - php-version: '7.4'
                     - php-version: '8.0'
+                      dependencies: 'lowest'
                     - php-version: '8.1'
                     - php-version: '8.2'
                     - php-version: '8.3'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,9 @@ Changelog
 ------------------
 
 * Support Symfony 7
-* Test with PHP 8.3
+* Drop support for Symfony 2
+* Remove deprecated code, clean up workarounds for Symfony 2.
+* Drop support for PHP 7, test with PHP 8.3
 * Adjusted commands to have the return type declarations.
 
 1.x

diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ramsey/uuid": "^3.5",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,8 +2,3 @@ parameters:
     level: 2
     paths:
         - src
-    ignoreErrors:
-        -
-            message: "#Symfony\\\\Component\\\\Console\\\\Helper\\\\DialogHelper#"
-            count: 3
-            path: src/PHPCR/Util/Console/Command/BaseCommand.php
diff --git a/src/PHPCR/Util/CND/Exception/ParserException.php b/src/PHPCR/Util/CND/Exception/ParserException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PHPCR\Util\CND\Exception;
 
 use PHPCR\Util\CND\Scanner\GenericToken;
@@ -12,7 +14,7 @@
  */
 class ParserException extends \Exception
 {
-    public function __construct(TokenQueue $queue, $msg)
+    public function __construct(TokenQueue $queue, string $msg)
     {
         $token = $queue->peek();
         $msg = sprintf("PARSER ERROR: %s. Current token is [%s, '%s'] at line %s, column %s", $msg, GenericToken::getTypeName($token->getType()), $token->getData(), $token->getLine(), $token->getRow());

diff --git a/src/PHPCR/Util/CND/Exception/ScannerException.php b/src/PHPCR/Util/CND/Exception/ScannerException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PHPCR\Util\CND\Exception;
 
 use PHPCR\Util\CND\Reader\ReaderInterface;
@@ -11,7 +13,7 @@
  */
 class ScannerException extends \Exception
 {
-    public function __construct(ReaderInterface $reader, $msg)
+    public function __construct(ReaderInterface $reader, string $msg)
     {
         $msg = sprintf(
             "SCANNER ERROR: %s at line %s, column %s.\nCurrent buffer \"%s\"",

diff --git a/src/PHPCR/Util/CND/Parser/AbstractParser.php b/src/PHPCR/Util/CND/Parser/AbstractParser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PHPCR\Util\CND\Parser;
 
 use PHPCR\Util\CND\Exception\ParserException;
@@ -23,10 +25,8 @@ abstract class AbstractParser
 {
     /**
      * The token queue.
-     *
-     * @var TokenQueue
      */
-    protected $tokenQueue;
+    protected TokenQueue $tokenQueue;
 
     /**
      * Check the next token without consuming it and return true if it matches the given type and data.
@@ -36,10 +36,8 @@ abstract class AbstractParser
      * @param int         $type       The expected token type
      * @param string|null $data       The expected data or null
      * @param bool        $ignoreCase whether to do string comparisons case insensitive or sensitive
-     *
-     * @return bool
      */
-    protected function checkToken($type, $data = null, $ignoreCase = false)
+    protected function checkToken($type, string $data = null, bool $ignoreCase = false): bool
     {
         if ($this->tokenQueue->isEof()) {
             return false;
@@ -65,11 +63,9 @@ protected function checkToken($type, $data = null, $ignoreCase = false)
     /**
      * Check if the token data is one of the elements of the data array.
      *
-     * @param int $type
-     *
-     * @return bool
+     * @param string[] $data
      */
-    protected function checkTokenIn($type, array $data, $ignoreCase = false)
+    protected function checkTokenIn(int $type, array $data, bool $ignoreCase = false): bool
     {
         foreach ($data as $d) {
             if ($this->checkToken($type, $d, $ignoreCase)) {
@@ -87,11 +83,9 @@ protected function checkTokenIn($type, array $data, $ignoreCase = false)
      * @param int         $type The expected token type
      * @param string|null $data The expected token data or null
      *
-     * @return Token
-     *
      * @throws ParserException
      */
-    protected function expectToken($type, $data = null)
+    protected function expectToken(int $type, string $data = null): Token
     {
         $token = $this->tokenQueue->peek();
 
@@ -110,10 +104,8 @@ protected function expectToken($type, $data = null)
      *
      * @param int         $type The expected token type
      * @param string|null $data The expected token data or null
-     *
-     * @return bool|Token
      */
-    protected function checkAndExpectToken($type, $data = null)
+    protected function checkAndExpectToken(int $type, string $data = null): bool|Token
     {
         if ($this->checkToken($type, $data)) {
             $token = $this->tokenQueue->peek();