[WIP] 6.x (#405)

* Updated CI * Fixed middlewares override (#341) * Revert unwanted PHP >= 8.0 changes * Updated branch alias * Reverted and adjusted middleware test * Adjusted middleware registration priority (fixed failing tests) * Fixed unwanted deps changes * Fixed failing test * #345 Deprecation in RoleChecker and UserProvider (#350) * #345 Deprecation in RoleChecker and UserProvider * remove line --------- Co-authored-by: a.dmitryuk <[email protected]> * Fixed CI (PHPStan) * Support doctrine/annotations:2.0 (#351) * remove doctrine/annotations from composer.json * doctrine/annotations 2.0 --------- Co-authored-by: a.dmitryuk <[email protected]> * Fixed compatibility with Symfony 4.4 * PHP-CS-Fixer * Fixed CI (#367) * PHP-CS-Fixer * Fix: `ViewerController` (#379) * Fix: `ViewerController` * - * - * - * Fixed remaining calls to AbstractController methods. * - * - * - * - * PHP-CS-Fixer --------- Co-authored-by: Damien Harper <[email protected]> * CI updates * Make `ViewerController` final (#385) Co-authored-by: Damien Harper <[email protected]> * Test more PHP versions (#389) Co-authored-by: Damien Harper <[email protected]> * Use `actions/checkout@v4` (#387) Co-authored-by: Damien Harper <[email protected]> * PHP-CS-Fixer * Update deps + PHP-CS-Fixer * PHP-CS-Fixer (3.48.0) * 6.x Signed-off-by: Oleg Andreyev <[email protected]> * reverted ci-5.x.yml Signed-off-by: Oleg Andreyev <[email protected]> * reverted ci-5.x.yml Signed-off-by: Oleg Andreyev <[email protected]> * clean composer.json Signed-off-by: Oleg Andreyev <[email protected]> * reverted ci-4.x.yml Signed-off-by: Oleg Andreyev <[email protected]> * damienharper/auditor dev-master Signed-off-by: Oleg Andreyev <[email protected]> * allow ^3.1 orm Signed-off-by: Oleg Andreyev <[email protected]> --------- Signed-off-by: Oleg Andreyev <[email protected]> Co-authored-by: Damien Harper <[email protected]> Co-authored-by: Alexander Dmitryuk <[email protected]> Co-authored-by: a.dmitryuk <[email protected]> Co-authored-by: Oskar Stark <[email protected]>
DamienHarper · Jul 14, 2024 · 4b8b92b · 4b8b92b
1 parent ff03c09
commit 4b8b92b
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 73 deletions.
diff --git a/composer.json b/composer.json
@@ -1,75 +1,83 @@
 {
-    "name": "damienharper/auditor-bundle",
-    "type": "symfony-bundle",
-    "description": "Integrate auditor library in your Symfony projects.",
-    "keywords": ["doctrine", "audit", "auditor", "audit-log", "audit-trail"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Damien Harper",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": ">=8.2",
-        "damienharper/auditor": "dev-master",
-        "doctrine/doctrine-bundle": "^2.0",
-        "doctrine/orm": "^2.13",
-        "symfony/asset": "^5.4|^6.0|^7.0",
-        "symfony/doctrine-bridge": "^5.4|^6.0|^7.0",
-        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-        "symfony/lock": "^5.4|^6.0|^7.0",
-        "symfony/security-bundle": "^5.4|^6.0|^7.0",
-        "symfony/translation": "^5.4|^6.0|^7.0",
-        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
-        "twig/extra-bundle": "^3.3",
-        "twig/intl-extra": "^3.3"
-    },
-    "autoload": {
-        "psr-4": {
-            "DH\\AuditorBundle\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "DH\\AuditorBundle\\Tests\\": "tests",
-            "DH\\Auditor\\Tests\\": "vendor/damienharper/auditor/tests"
-        }
-    },
-    "require-dev": {
-        "gedmo/doctrine-extensions": "^2.4|^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0|^5.0",
-        "nyholm/symfony-bundle-test": "^2.0|^3.0",
-        "phpunit/phpunit": "^9.0",
-        "symfony/browser-kit": "^5.4|^6.0|^7.0",
-        "symfony/css-selector": "^5.4|^6.0|^7.0",
-        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
-        "symfony/var-dumper": "^5.4|^6.0|^7.0",
-        "symfony/webpack-encore-bundle": "^1.12|^2.0",
-        "doctrine/data-fixtures": "^1.4"
-    },
-    "scripts": {
-        "test": "php -d pcov.enabled=1 ./vendor/bin/phpunit --colors=always",
-        "csfixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no --verbose --ansi",
-        "cs-check": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no --verbose --ansi --dry-run",
-        "phpstan": "tools/phpstan/vendor/bin/phpstan --ansi analyse src",
-        "setup44": "SYMFONY_REQUIRE='^4.4' composer update --prefer-stable",
-        "setup54": "SYMFONY_REQUIRE='^5.4' composer update --prefer-stable",
-        "rector": "tools/rector/vendor/bin/rector process src",
-        "rector-check": "tools/rector/vendor/bin/rector --dry-run",
-        "update-tools": "composer update --working-dir=tools/php-cs-fixer ; composer update --working-dir=tools/phpstan ; composer update --working-dir=tools/rector"
-    },
-    "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.x-dev",
-            "dev-5.x": "5.x-dev",
-            "dev-4.x": "4.x-dev"
-        }
+  "name": "damienharper/auditor-bundle",
+  "type": "symfony-bundle",
+  "description": "Integrate auditor library in your Symfony projects.",
+  "keywords": [
+    "doctrine",
+    "audit",
+    "auditor",
+    "audit-log",
+    "audit-trail"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Damien Harper",
+      "email": "[email protected]"
     }
+  ],
+  "require": {
+    "php": ">=8.1",
+    "ext-json": "*",
+    "damienharper/auditor": "dev-master",
+    "doctrine/annotations": "^1.8|^2.0",
+    "doctrine/doctrine-bundle": "^2.0",
+    "doctrine/orm": "^2.13 || ^3.1" ,
+    "symfony/asset": "^5.4|^6.0|^7.0",
+    "symfony/doctrine-bridge": "^5.4|^6.0|^7.0",
+    "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+    "symfony/lock": "^5.4|^6.0|^7.0",
+    "symfony/security-bundle": "^5.4|^6.0|^7.0",
+    "symfony/translation": "^5.4|^6.0|^7.0",
+    "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+    "twig/extra-bundle": "^3.3",
+    "twig/intl-extra": "^3.3"
+  },
+  "autoload": {
+    "psr-4": {
+      "DH\\AuditorBundle\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "DH\\AuditorBundle\\Tests\\": "tests",
+      "DH\\Auditor\\Tests\\": "vendor/damienharper/auditor/tests"
+    }
+  },
+  "require-dev": {
+    "gedmo/doctrine-extensions": "^2.4|^3.0",
+    "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0|^5.0",
+    "nyholm/symfony-bundle-test": "^2.0|^3.0",
+    "phpunit/phpunit": "^9.0",
+    "symfony/browser-kit": "^5.4|^6.0|^7.0",
+    "symfony/css-selector": "^5.4|^6.0|^7.0",
+    "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+    "symfony/var-dumper": "^5.4|^6.0|^7.0",
+    "symfony/webpack-encore-bundle": "^1.12|^2.0",
+    "doctrine/data-fixtures": "^1.4"
+  },
+  "scripts": {
+    "test": "php -d pcov.enabled=1 ./vendor/bin/phpunit --colors=always",
+    "csfixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no --verbose --ansi",
+    "cs-check": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --using-cache=no --verbose --ansi --dry-run",
+    "phpstan": "tools/phpstan/vendor/bin/phpstan --ansi analyse src",
+    "setup44": "SYMFONY_REQUIRE='^4.4' composer update --prefer-stable",
+    "setup54": "SYMFONY_REQUIRE='^5.4' composer update --prefer-stable",
+    "rector": "tools/rector/vendor/bin/rector process src",
+    "rector-check": "tools/rector/vendor/bin/rector --dry-run",
+    "update-tools": "composer update --working-dir=tools/php-cs-fixer ; composer update --working-dir=tools/phpstan ; composer update --working-dir=tools/rector"
+  },
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "6.x-dev",
+      "dev-5.x": "5.x-dev",
+      "dev-4.x": "4.x-dev"
+    }
+  }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -5,6 +5,8 @@ includes:
 parameters:
     level: max
     inferPrivatePropertyTypeFromConstructor: true
+    paths:
+        - src
 
     excludePaths:
         - '%currentWorkingDirectory%/src/DependencyInjection/Configuration.php'

diff --git a/src/User/UserProvider.php b/src/User/UserProvider.php
@@ -85,7 +85,7 @@ private function getImpersonatorUser(): ?UserInterface
     {
         $token = $this->tokenStorage->getToken();
 
-        if (null !== $token && $token instanceof SwitchUserToken) {
+        if ($token instanceof SwitchUserToken) {
             return $token->getOriginalToken()->getUser();
         }