Version 1.0

.github/workflows/linting.yaml

@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.4', '8.0', '8.1']
+                php: ['8.1', '8.2']
 
         name: Linting - PHP ${{ matrix.php }}
         steps:

composer.json

@@ -10,22 +10,21 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
-        "symfony/asset": "^4.4 || ^5.4 || ^6.0",
-        "symfony/config": "^4.4 || ^5.4 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
-        "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
-        "symfony/options-resolver": "^4.4 || ^5.4 || ^6.0",
-        "symfony/security-core": "^4.4 || ^5.4 || ^6.0",
-        "symfony/translation": "^4.4 || ^5.4 || ^6.0",
-        "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0",
+        "php": "8.1.*||8.2.*",
+        "symfony/asset": "^6.0",
+        "symfony/config": "^6.0",
+        "symfony/dependency-injection": "^6.0",
+        "symfony/event-dispatcher": "^6.0",
+        "symfony/http-foundation": "^6.0",
+        "symfony/http-kernel": "^6.0",
+        "symfony/options-resolver": "^6.0",
+        "symfony/security-core": "^6.0",
+        "symfony/translation": "^6.0",
+        "symfony/twig-bridge": "^6.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "phpspec/prophecy": "^1.6",
-        "symfony/framework-bundle" : "^4.4 || ^5.4 || ^6.0",
+        "symfony/framework-bundle" : "^6.0",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
         "phpstan/phpstan": "^1.0",
@@ -49,8 +48,8 @@
     "scripts": {
         "tests": "vendor/bin/phpunit tests/",
         "phpstan": [
-            "vendor/bin/phpstan analyse src/ --level=5",
-            "vendor/bin/phpstan analyse -c tests/phpstan.neon tests/ --level=5"
+            "vendor/bin/phpstan analyse -c phpstan.neon src/",
+            "vendor/bin/phpstan analyse -c tests/phpstan.neon tests/"
         ],
         "codestyle": "vendor/bin/php-cs-fixer fix --dry-run --verbose --show-progress=none",
         "codestyle-fix": "vendor/bin/php-cs-fixer fix"

phpstan.neon

@@ -4,5 +4,6 @@ includes:
     - vendor/phpstan/phpstan-symfony/rules.neon
 
 parameters:
+    level: 9
     excludePaths:
         - %rootDir%/../../

src/DependencyInjection/TablerExtension.php

@@ -33,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yml');
 
-        if ($options['knp_menu']['enable'] === true) {
+        if (\array_key_exists('knp_menu', $options) && \array_key_exists('enable', $options['knp_menu']) && $options['knp_menu']['enable'] === true) {
             $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config/container'));
             $loader->load('knp-menu.yml');
         }
@@ -42,13 +42,13 @@ public function load(array $configs, ContainerBuilder $container): void
     /**
      * Merge available configuration options, so they are all available for the ContextHelper.
      *
-     * @param array $config
-     * @return array
+     * @param array<string, mixed> $config
+     * @return array<string, array<string, mixed>>
      */
-    protected function getContextOptions(array $config = []): array
+    private function getContextOptions(array $config): array
     {
         $contextOptions = (array) ($config['options'] ?? []);
-        $contextOptions['knp_menu'] = (array) $config['knp_menu'];
+        $contextOptions['knp_menu'] = (array) ($config['knp_menu'] ?? []);
 
         return $contextOptions;
     }

src/Event/MenuEvent.php

@@ -20,15 +20,10 @@ class MenuEvent extends ThemeEvent
     /**
      * @var MenuItemInterface[]
      */
-    private $menuRootItems = [];
-    /**
-     * @var Request
-     */
-    private $request;
+    private array $menuRootItems = [];
 
-    public function __construct(Request $request)
+    public function __construct(private Request $request)
     {
-        $this->request = $request;
     }
 
     public function getRequest(): Request

src/Event/NotificationEvent.php

@@ -16,7 +16,7 @@ class NotificationEvent extends ThemeEvent
     /**
      * @var array<NotificationInterface>
      */
-    private $notifications = [];
+    private array $notifications = [];
 
     /**
      * @param int|null $max

src/Event/UserDetailsEvent.php

@@ -17,15 +17,12 @@
  */
 class UserDetailsEvent extends ThemeEvent
 {
-    /**
-     * @var UserInterface
-     */
-    private $user;
+    private ?UserInterface $user = null;
     /**
      * @var MenuItemInterface[]
      */
-    private $links = [];
-    private $showLogoutLink = true;
+    private array $links = [];
+    private bool $showLogoutLink = true;
 
     public function setUser(UserInterface $user): void
     {

src/Helper/ContextHelper.php

@@ -9,11 +9,19 @@
 
 namespace KevinPapst\TablerBundle\Helper;
 
+/**
+ * @extends \ArrayObject<string, mixed>
+ */
 class ContextHelper extends \ArrayObject
 {
     public function getLogoUrl(): ?string
     {
-        return $this->getOption('logo_url');
+        $logo = $this->getOption('logo_url');
+        if (\is_string($logo)) {
+            return $logo;
+        }
+
+        return null;
     }
 
     public function setLogoUrl(?string $logo): void
@@ -73,7 +81,12 @@ public function setIsDarkMode(bool $isDarkMode): void
 
     public function getAssetVersion(): string
     {
-        return (string) $this->getOption('asset_version');
+        $version = $this->getOption('asset_version');
+        if (\is_string($version)) {
+            return $version;
+        }
+
+        return '1.0';
     }
 
     public function setAssetVersion(string $assetVersion): void
@@ -113,24 +126,28 @@ public function setIsBoxedLayout(bool $boxed): void
 
     public function getSecurityCoverUrl(): string
     {
-        return (string) $this->getOption('security_cover_url');
+        $cover = $this->getOption('security_cover_url');
+        if (\is_string($cover)) {
+            return $cover;
+        }
+
+        return '';
     }
 
     public function setSecurityCoverUrl(string $url): void
     {
         $this->setOption('security_cover_url', $url);
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getOptions(): array
     {
         return $this->getArrayCopy();
     }
 
-    /**
-     * @param string $name
-     * @param mixed|null $value
-     */
-    public function setOption(string $name, $value): void
+    public function setOption(string $name, mixed $value): void
     {
         $this->offsetSet($name, $value);
     }
@@ -140,12 +157,7 @@ public function hasOption(string $name): bool
         return $this->offsetExists($name);
     }
 
-    /**
-     * @param string $name
-     * @param mixed $default
-     * @return mixed|null
-     */
-    public function getOption(string $name, $default = null)
+    public function getOption(string $name, mixed $default = null): mixed
     {
         return $this->offsetExists($name) ? $this->offsetGet($name) : $default;
     }

src/Model/MenuItemInterface.php

@@ -21,6 +21,9 @@ public function getTranslationDomain(): string;
 
     public function getRoute(): ?string;
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getRouteArgs(): array;
 
     public function getIcon(): ?string;

src/Model/MenuItemModel.php

@@ -14,6 +14,7 @@ class MenuItemModel implements MenuItemInterface
     private string $identifier;
     private string $label;
     private ?string $route;
+    /** @var array<string, mixed> */
     private array $routeArgs;
     private ?string $icon;
     /** @var array<MenuItemInterface> */
@@ -26,6 +27,9 @@ class MenuItemModel implements MenuItemInterface
     private bool $expanded = false;
     private string $translationDomain = 'messages';
 
+    /**
+     * @param array<string, mixed> $routeArgs
+     */
     public function __construct(
         string $identifier,
         string $label,
@@ -78,9 +82,7 @@ public function getIsActive(): bool
 
     public function setIsActive(bool $isActive): void
     {
-        if ($this->hasParent()) {
-            $this->getParent()->setIsActive($isActive);
-        }
+        $this->parent?->setIsActive($isActive);
 
         $this->isActive = $isActive;
     }
@@ -125,6 +127,9 @@ public function getRouteArgs(): array
         return $this->routeArgs;
     }
 
+    /**
+     * @param array<string, mixed> $routeArgs
+     */
     public function setRouteArgs(array $routeArgs): void
     {
         $this->routeArgs = $routeArgs;

src/Model/NotificationModel.php

@@ -13,16 +13,10 @@
 
 class NotificationModel implements NotificationInterface
 {
-    private $id;
-    private $message;
-    private $type;
-    private $url;
+    private ?string $url = null;
 
-    public function __construct(string $id, string $message, string $type = Constants::TYPE_INFO)
+    public function __construct(private string $id, private string $message, private string $type = Constants::TYPE_INFO)
     {
-        $this->id = $id;
-        $this->message = $message;
-        $this->type = $type;
     }
 
     public function getIdentifier(): string

src/Model/UserInterface.php

@@ -13,23 +13,16 @@ interface UserInterface
 {
     /**
      * The user identifier for generating links.
-     *
-     * @return string
-     * @deprecated will be renamed to getUserIdentifier() once we raise the minimum SF version to 5
      */
-    public function getIdentifier(): string;
+    public function getUserIdentifier(): string;
 
     /**
      * Returns the display name (full name, email or whatever you want to use.
-     *
-     * @return string
      */
     public function getName(): string;
 
     /**
      * Additional title that can be displayed next to the user.
-     *
-     * @return string|null
      */
     public function getTitle(): ?string;
 
@@ -38,8 +31,6 @@ public function getTitle(): ?string;
      *
      * You can change the avatar behaviour and return any other string, you just need
      * to overwrite the avatar component at templates/components/avatar_image.html.twig.
-     *
-     * @return string|null
      */
     public function getAvatar(): ?string;
 }

src/Model/UserModel.php

@@ -11,27 +11,11 @@
 
 final class UserModel implements UserInterface
 {
-    /**
-     * @var string
-     */
-    private $id;
-    /**
-     * @var string
-     */
-    private $name;
-    /**
-     * @var string|null
-     */
-    private $title;
-    /**
-     * @var string|null
-     */
-    private $avatar;
+    private ?string $title = null;
+    private ?string $avatar = null;
 
-    public function __construct(string $id, string $name)
+    public function __construct(private string $id, private string $name)
     {
-        $this->id = $id;
-        $this->name = $name;
     }
 
     public function getId(): string
@@ -74,7 +58,15 @@ public function getTitle(): ?string
         return $this->title;
     }
 
+    /**
+     * @deprecated use getUserIdentifier instead
+     */
     public function getIdentifier(): string
+    {
+        return $this->getUserIdentifier();
+    }
+
+    public function getUserIdentifier(): string
     {
         if (!empty($this->id)) {
             return $this->id;

src/TablerBundle.php

@@ -20,7 +20,7 @@ public function getPath(): string
         return \dirname(__DIR__);
     }
 
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
         $container->addCompilerPass(new TwigPass());