Fix nullable typing causing a deprecation in PHP 8.4

Author: tobias-93

Builder/BaseBuilder.php

@@ -25,7 +25,7 @@ public function getTemplateName(): string
         return '@AdmingeneratorGenerator/templates/' . $this->getGenerator()->getTemplateBaseDir() . parent::getTemplateName();
     }
 
-    public function __construct(Environment $environment = null)
+    public function __construct(?Environment $environment = null)
     {
         parent::__construct();
         $this->twigExtensions[] = ClassifyExtension::class;

EventListener/ControllerListener.php

@@ -27,7 +27,7 @@ public function __construct(
         $this->cacheSuffix = 'default';
     }
 
-    public function setCacheProvider(CacheInterface $cacheProvider = null, $cacheSuffix = 'default'): void
+    public function setCacheProvider(?CacheInterface $cacheProvider = null, $cacheSuffix = 'default'): void
     {
         $this->cacheProvider = $cacheProvider;
         $this->cacheSuffix = $cacheSuffix;

Menu/AdmingeneratorMenuBuilder.php

@@ -53,7 +53,7 @@ protected function addLinkRoute(ItemInterface $menu, string $label, string $rout
     /**
      * Set active class to current item and all its parents (so it is automatically opened)
      */
-    protected function setActive(ItemInterface $item = null): void
+    protected function setActive(?ItemInterface $item = null): void
     {
         if ($item) {
             $this->setActive($item->getParent());

Resources/views/templates/CommonAdmin/ActionsAction/object_action.php.twig

@@ -102,7 +102,7 @@
      * @param \{{ model }} ${{ builder.ModelClass }} Your \{{ model }} object
      * @return Response Must return a response!
      */
-    protected function errorObject{{ action.name|php_name|capitalize }}(\Exception $e, \{{ model }} ${{ builder.ModelClass }} = null)
+    protected function errorObject{{ action.name|php_name|capitalize }}(\Exception $e, ?\{{ model }} ${{ builder.ModelClass }} = null)
     {
 
         // Throw exception if defined

Resources/views/templates/CommonAdmin/ActionsAction/object_delete.php.twig

@@ -99,7 +99,7 @@
      * @param \{{ model }} ${{ builder.ModelClass }} Your \{{ model }} object
      * @return Response Must return a response!
      */
-    protected function errorObjectDelete(\Exception $e, \{{ model }} ${{ builder.ModelClass }} = null)
+    protected function errorObjectDelete(\Exception $e, ?\{{ model }} ${{ builder.ModelClass }} = null)
     {
 
         // Throw exception if defined

Resources/views/templates/CommonAdmin/EditType/type.php.twig

@@ -71,7 +71,7 @@ class {{ builder.YamlKey|ucfirst }}Type extends BaseType
      *
      * @return boolean
      */
-    protected function canDisplay{{ column.name|classify|php_name }}(\{{ model }} ${{ builder.ModelClass }} = null)
+    protected function canDisplay{{ column.name|classify|php_name }}(?\{{ model }} ${{ builder.ModelClass }} = null)
     {
         {% if column.credentials is not empty and column.credentials != 'AdmingenAllowed' %}
             {% if(admingenerator_config('use_jms_security')) %}

Resources/views/templates/CommonAdmin/security_action.php.twig

@@ -13,7 +13,7 @@
     * @param \{{ model }} ${{ builder.ModelClass }}
     * @return boolean
     */
-    protected function validateCredentials($credentials, \{{ model }} ${{ builder.ModelClass }} = null)
+    protected function validateCredentials($credentials, ?\{{ model }} ${{ builder.ModelClass }} = null)
     {
     {% if(admingenerator_config('use_jms_security')) %}
         $credentials = new Expression($credentials);
@@ -29,7 +29,7 @@
     * @param \{{ model }} ${{ builder.ModelClass }}
     * @throws AccessDeniedException if is not allowed
     */
-    protected function denyAccessUnlessValidateCredentials($credentials, \{{ model }} ${{ builder.ModelClass }} = null)
+    protected function denyAccessUnlessValidateCredentials($credentials, ?\{{ model }} ${{ builder.ModelClass }} = null)
     {
     if (!$this->validateCredentials($credentials, ${{ builder.ModelClass }})) {
     throw $this->createAccessDeniedException('Credentials unsatisfied');

Routing/NestedRoutingLoader.php

@@ -6,7 +6,7 @@
 
 class NestedRoutingLoader extends RoutingLoader
 {
-    public function load(mixed $resource, string $type = null): RouteCollection
+    public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         $this->actions['nested_move'] = array(
             'path'         => '/nested-move/{dragged}/{action}/{dropped}',
@@ -19,7 +19,7 @@ public function load(mixed $resource, string $type = null): RouteCollection
         return parent::load($resource, $type);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'admingenerator_nested' == $type;
     }

Routing/RoutingLoader.php

@@ -91,7 +91,7 @@ class RoutingLoader extends FileLoader
 
     protected array $yaml = [];
 
-    public function load(mixed $resource, string $type = null): RouteCollection
+    public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         $collection = new RouteCollection();
 
@@ -165,7 +165,7 @@ public function load(mixed $resource, string $type = null): RouteCollection
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'admingenerator' == $type;
     }

Tests/DependencyInjection/ConfigurationTest.php

@@ -23,7 +23,7 @@ public function testDefaultConfig(): void
      * Get waiting default values from configuration. If $key is not null
      * and is in first level keys, returns value of this specific key only.
      */
-    private function getBundleDefaultConfig(string $key = null): mixed
+    private function getBundleDefaultConfig(?string $key = null): mixed
     {
         static $defaultConfiguration = [
             'generate_base_in_project_dir'  => false,

Tests/Mocks/Doctrine/DriverMock.php

@@ -12,7 +12,7 @@ class DriverMock implements Driver
 {
     private ?DatabasePlatformMock $_platformMock = null;
 
-    public function connect(array $params, $username = null, $password = null, array $driverOptions = array()): Driver\Connection
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = []): Driver\Connection
     {
         return new DriverConnectionMock();
     }

Tests/Mocks/Doctrine/EntityManagerMock.php

@@ -43,8 +43,8 @@ public function getUnitOfWork(): UnitOfWork
     /**
      * Mock factory method to create an EntityManager.
      */
-    public static function create(Connection $conn, \Doctrine\ORM\Configuration $config = null,
-            \Doctrine\Common\EventManager $eventManager = null): EntityManagerMock
+    public static function create(Connection $conn, ?\Doctrine\ORM\Configuration $config = null,
+            ?\Doctrine\Common\EventManager $eventManager = null): EntityManagerMock
     {
         if (is_null($config)) {
             $config = new \Doctrine\ORM\Configuration();

Twig/Extension/EchoExtension.php

@@ -85,7 +85,7 @@ public function convertAsForm(string $options, string $formType): string
      * Print "trans" tag for string $str with parameters $parameters
      * for catalog $catalog.
      */
-    public function getEchoTrans(string $str, array $parameters = [], string $catalog = 'Admingenerator', bool|string $escape = null): string
+    public function getEchoTrans(string $str, array $parameters = [], string $catalog = 'Admingenerator', bool|string|null $escape = null): string
     {
         $transParameters = '{}';
         $bag_parameters = [];
@@ -120,7 +120,7 @@ public function getEchoTrans(string $str, array $parameters = [], string $catalo
     /**
      * Print "echo tag with path call" to the path $path with params $params.
      */
-    public function getEchoPath(string $path, string $params = null, array|string $filters = null): string
+    public function getEchoPath(string $path, string $params = null, array|string|null $filters = null): string
     {
         if (null === $params) {
             return (null === $filters)
@@ -152,7 +152,7 @@ public function getEchoPath(string $path, string $params = null, array|string $f
      * Print "if" tag with condition to is_expr_granted('$credentials')
      * If $modelName is not null, append the $modelName to the function call.
      */
-    public function getEchoIfGranted(string $credentials, string $modelName = null): string
+    public function getEchoIfGranted(string $credentials, ?string $modelName = null): string
     {
         if ('AdmingenAllowed' == $credentials) {
             return "{% if (true) %}";

Twig/Extension/SecurityExtension.php

@@ -26,7 +26,7 @@ public function getFunctions(): array
         ];
     }
 
-    public function isOneGranted(array $credentials, object $object = null): bool
+    public function isOneGranted(array $credentials, ?object $object = null): bool
     {
         if (empty($credentials)) {
             return true;