[Task] Follow up native params and return type hints

bundles/AdminBundle/src/Controller/Admin/DataObject/DataObjectHelperController.php

@@ -410,7 +410,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
                                     $keyFieldDef = json_decode($keyDef->getDefinition(), true);
                                     if ($keyFieldDef) {
                                         $keyFieldDef = \Pimcore\Model\DataObject\Classificationstore\Service::getFieldDefinitionFromJson($keyFieldDef, $keyDef->getType());
-                                        $fieldConfig = $this->getFieldGridConfig($keyFieldDef, $gridType, $sc['position'], true, null, $class, $objectId);
+                                        $fieldConfig = $this->getFieldGridConfig($keyFieldDef, $gridType, (string)$sc['position'], true, null, $class, $objectId);
                                         if ($fieldConfig) {
                                             $fieldConfig['key'] = $key;
                                             $fieldConfig['label'] = '#' . $keyFieldDef->getTitle();
@@ -452,7 +452,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
                             }
 
                             if ($fd !== null) {
-                                $fieldConfig = $this->getFieldGridConfig($fd, $gridType, $sc['position'], true, $keyPrefix, $class, $objectId);
+                                $fieldConfig = $this->getFieldGridConfig($fd, $gridType, (string)$sc['position'], true, $keyPrefix, $class, $objectId);
                                 if (!empty($fieldConfig)) {
                                     if (isset($sc['width'])) {
                                         $fieldConfig['width'] = $sc['width'];
@@ -482,7 +482,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
                                 }
 
                                 if (!empty($fd)) {
-                                    $fieldConfig = $this->getFieldGridConfig($fd, $gridType, $sc['position'], true, null, $class, $objectId);
+                                    $fieldConfig = $this->getFieldGridConfig($fd, $gridType, (string)$sc['position'], true, null, $class, $objectId);
                                     if (!empty($fieldConfig)) {
                                         if (isset($sc['width'])) {
                                             $fieldConfig['width'] = $sc['width'];

bundles/AdminBundle/src/Controller/Admin/ElementController.php

@@ -62,7 +62,7 @@ public function lockElementAction(Request $request): Response
      */
     public function unlockElementAction(Request $request): Response
     {
-        Element\Editlock::unlock($request->get('id'), $request->get('type'));
+        Element\Editlock::unlock((int)$request->get('id'), $request->get('type'));
 
         return $this->adminJson(['success' => true]);
     }

bundles/AdminBundle/src/EventListener/UsageStatisticsListener.php

@@ -104,7 +104,7 @@ protected function getParams(Request $request): array
                 $value = json_decode($value);
                 if (is_array($value)) {
                     array_walk_recursive($value, function (&$item, $key) {
-                        if (strpos($key, 'pass') !== false) {
+                        if (strpos((string)$key, 'pass') !== false) {
                             $item = '*************';
                         }
                     });

bundles/AdminBundle/src/Security/Authenticator/AdminLoginAuthenticator.php

@@ -58,7 +58,7 @@ public function start(Request $request, AuthenticationException $authException =
             return $response;
         }
 
-        $event = new LoginRedirectEvent(self::PIMCORE_ADMIN_LOGIN, ['perspective' => strip_tags($request->get('perspective'))]);
+        $event = new LoginRedirectEvent(self::PIMCORE_ADMIN_LOGIN, ['perspective' => strip_tags($request->get('perspective', '') )]);
         $this->dispatcher->dispatch($event, AdminEvents::LOGIN_REDIRECT);
 
         $url = $this->router->generate($event->getRouteName(), $event->getRouteParams());

bundles/EcommerceFrameworkBundle/src/Environment.php

@@ -150,7 +150,7 @@ public function clearEnvironment()
         $this->currentAssortmentSubTenant = null;
         $this->currentCheckoutTenant = null;
         $this->currentTransientCheckoutTenant = null;
-        $this->useGuestCart = false;
+        $this->useGuestCart = null;
     }
 
     public function setDefaultCurrency(Currency $currency)

lib/Navigation/Renderer/AbstractRenderer.php

@@ -210,14 +210,17 @@ public function setRenderInvisible(bool $renderInvisible = true): static
      *
      * @return array
      */
-    public function findActive(Container $container, int $minDepth = null, int $maxDepth = -1): array
+    public function findActive(Container $container, int $minDepth = null, int $maxDepth = null): array
     {
         if (!is_int($minDepth)) {
             $minDepth = $this->getMinDepth();
         }
         if ((!is_int($maxDepth) || $maxDepth < 0) && null !== $maxDepth) {
             $maxDepth = $this->getMaxDepth();
         }
+        if(is_null($maxDepth)) {
+            $maxDepth = -1;
+        }
 
         $found = null;
         $foundDepth = -1;

lib/Navigation/Renderer/Breadcrumbs.php

@@ -68,9 +68,9 @@ class Breadcrumbs extends AbstractRenderer
     /**
      * Partial view script to use for rendering menu
      *
-     * @var string|array
+     * @var string|array|null
      */
-    protected string|array $_template;
+    protected string|array|null $_template = null;
 
     // Accessors:
 
@@ -110,12 +110,12 @@ public function getLinkLast(): bool
         return $this->_linkLast;
     }
 
-    public function getTemplate(): array|string
+    public function getTemplate(): array|string|null
     {
         return $this->_template;
     }
 
-    public function setTemplate(array|string $template): static
+    public function setTemplate(array|string|null $template): static
     {
         $this->_template = $template;
 

lib/Routing/RedirectHandler.php

@@ -242,12 +242,16 @@ private function getRegexRedirects(): array
         }
 
         $cacheKey = 'system_route_redirect';
-        if (($this->redirects = Cache::load($cacheKey)) === false) {
+        $valueFromCache = Cache::load($cacheKey);
+        $this->redirects = $valueFromCache === false ? null : $valueFromCache;
+        if (!isset($this->redirects)) {
             // acquire lock to avoid concurrent redirect cache warm-up
             $this->lock->acquire(true);
 
             //check again if redirects are cached to avoid re-warming cache
-            if (($this->redirects = Cache::load($cacheKey)) === false) {
+            $valueFromCache = Cache::load($cacheKey);
+            $this->redirects = $valueFromCache === false ? null : $valueFromCache;
+            if (!isset($this->redirects)) {
                 try {
                     $list = new Redirect\Listing();
                     $list->setCondition('active = 1 AND regex = 1');

lib/Web2Print/Processor/PdfReactor.php

@@ -88,7 +88,7 @@ protected function getClient(): \com\realobjects\pdfreactor\webservice\client\PD
     /**
      * @internal
      */
-    public function getPdfFromString(string $html, array $params = [], bool $returnFilePath = false): bool|string
+    public function getPdfFromString(string $html, array $params = [], bool $returnFilePath = false): string
     {
         $pdfreactor = $this->getClient();
 
@@ -117,7 +117,7 @@ public function getPdfFromString(string $html, array $params = [], bool $returnF
     /**
      * @internal
      */
-    protected function buildPdf(Document\PrintAbstract $document, object $config): bool|string
+    protected function buildPdf(Document\PrintAbstract $document, object $config): string
     {
         $this->includeApi();
 

models/DataObject/ClassDefinition.php

@@ -1142,8 +1142,12 @@ public function setPreviewGeneratorReference(?string $previewGeneratorReference)
 
     public function getPreviewGenerator(): ?ClassDefinition\PreviewGeneratorInterface
     {
-        /** @var ClassDefinition\PreviewGeneratorInterface $interface */
-        $interface = DataObject\ClassDefinition\Helper\PreviewGeneratorResolver::resolveGenerator($this->getPreviewGeneratorReference());
+        $interface = null;
+
+        if($this->getPreviewGeneratorReference()) {
+            /** @var ClassDefinition\PreviewGeneratorInterface $interface */
+            $interface = DataObject\ClassDefinition\Helper\PreviewGeneratorResolver::resolveGenerator($this->getPreviewGeneratorReference());
+        }
 
         return $interface;
     }

models/DataObject/ClassDefinition/Data/AdvancedManyToManyObjectRelation.php

@@ -43,9 +43,9 @@ class AdvancedManyToManyObjectRelation extends ManyToManyObjectRelation implemen
     /**
      * @internal
      *
-     * @var string|null
+     * @var array|string|null
      */
-    public ?string $visibleFields = null;
+    public array|string|null $visibleFields = null;
 
     /**
      * @internal
@@ -645,7 +645,7 @@ public function setVisibleFields(array|string|null $visibleFields): static
         return $this;
     }
 
-    public function getVisibleFields(): ?string
+    public function getVisibleFields(): array|string|null
     {
         return $this->visibleFields;
     }

models/DataObject/ClassDefinition/Data/Localizedfields.php

@@ -153,7 +153,7 @@ class Localizedfields extends Data implements CustomResourcePersistingInterface,
     public ?array $permissionEdit = null;
 
     /**
-     * @param mixed $data
+     * @param mixed $localizedField
      * @param null|DataObject\Concrete $object
      * @param array $params
      *
@@ -162,16 +162,16 @@ class Localizedfields extends Data implements CustomResourcePersistingInterface,
      * @see Data::getDataForEditmode
      *
      */
-    public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): array
+    public function getDataForEditmode(mixed $localizedField, DataObject\Concrete $object = null, array $params = []): array
     {
         $fieldData = [];
         $metaData = [];
 
-        if (!$data instanceof DataObject\Localizedfield) {
+        if (!$localizedField instanceof DataObject\Localizedfield) {
             return [];
         }
 
-        $result = $this->doGetDataForEditMode($data, $object, $fieldData, $metaData, 1, $params);
+        $result = $this->doGetDataForEditMode($localizedField, $object, $fieldData, $metaData, 1, $params);
 
         // replace the real data with the data for the editmode
         foreach ($result['data'] as $language => &$data) {
@@ -185,7 +185,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
                     $childData->setContextualData($ownerType, $ownerName, $index, $language, null, null, $fieldDefinition);
                     $value = $fieldDefinition->getDataForEditmode($childData, $object, $params);
                 } else {
-                    $value = $fieldDefinition->getDataForEditmode($value, $object, array_merge($params, $data->getDao()->getFieldDefinitionParams($fieldDefinition->getName(), $language)));
+                    $value = $fieldDefinition->getDataForEditmode($value, $object, array_merge($params, $localizedField->getDao()->getFieldDefinitionParams($fieldDefinition->getName(), $language)));
                 }
             }
         }

models/DataObject/ClassDefinition/Data/ManyToManyObjectRelation.php

@@ -82,9 +82,9 @@ class ManyToManyObjectRelation extends AbstractRelations implements QueryResourc
     /**
      * @internal
      *
-     * @var string|null
+     * @var array|string|null
      */
-    public ?string $visibleFields = null;
+    public array|string|null $visibleFields = null;
 
     /**
      * @internal
@@ -782,7 +782,7 @@ public function setVisibleFields(array|string|null $visibleFields): static
         return $this;
     }
 
-    public function getVisibleFields(): ?string
+    public function getVisibleFields(): array|null|string
     {
         return $this->visibleFields;
     }

models/DataObject/Concrete.php

@@ -517,11 +517,11 @@ public function getClosestParentOfClass(string $classId): ?self
      *
      * @param string $fieldName
      * @param bool $forOwner
-     * @param string $remoteClassId
+     * @param string|null $remoteClassId
      *
      * @return array
      */
-    public function getRelationData(string $fieldName, bool $forOwner, string $remoteClassId): array
+    public function getRelationData(string $fieldName, bool $forOwner, ?string $remoteClassId = null): array
     {
         $relationData = $this->getDao()->getRelationData($fieldName, $forOwner, $remoteClassId);
 

models/DataObject/Concrete/Dao.php

@@ -74,7 +74,7 @@ public function getRelationIds(string $fieldName): array
         return $relations;
     }
 
-    public function getRelationData(string $field, bool $forOwner, string $remoteClassId): array
+    public function getRelationData(string $field, bool $forOwner, ?string $remoteClassId = null): array
     {
         $id = $this->model->getId();
         if ($remoteClassId) {

models/DataObject/Service.php

@@ -596,7 +596,7 @@ public static function getLanguagePermissions(Fieldcollection\Data\AbstractData|
         return $languageAllowed;
     }
 
-    public static function getLayoutPermissions(string $classId, array $permissionSet): ?array
+    public static function getLayoutPermissions(string $classId, ?array $permissionSet = null): ?array
     {
         $layoutPermissions = null;
 
@@ -1645,7 +1645,9 @@ public static function recursiveResetDirtyMap(AbstractObject $object)
         }
 
         if ($object instanceof Concrete) {
-            self::doResetDirtyMap($object, $object->getClass());
+            if(($class = $object->getClass()) !== null) {
+                self::doResetDirtyMap($object, $class);
+            }
         }
     }
 

models/Document/Editable/Select.php

@@ -66,7 +66,9 @@ public function frontend()
      */
     public function setDataFromResource(mixed $data): static
     {
-        $this->text = $data;
+        if(is_string($data)) {
+            $this->text = $data;
+        }
 
         return $this;
     }

models/Element/AdminStyle.php

@@ -29,9 +29,9 @@ class AdminStyle
 {
     protected string|bool|null $elementCssClass = '';
 
-    protected string|bool|null $elementIcon;
+    protected string|bool|null $elementIcon = null;
 
-    protected string|bool|null $elementIconClass;
+    protected string|bool|null $elementIconClass = null;
 
     protected ?array $elementQtipConfig = null;
 

models/Element/Editlock.php

@@ -28,7 +28,7 @@
  */
 final class Editlock extends Model\AbstractModel
 {
-    protected int $id;
+    protected ?int $id = null;
 
     protected int $cid;
 
@@ -114,7 +114,7 @@ public function getCid(): int
         return $this->cid;
     }
 
-    public function getId(): int
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -131,9 +131,9 @@ public function setCid(int $cid): static
         return $this;
     }
 
-    public function setId(int $id): static
+    public function setId(?int $id): static
     {
-        $this->id = (int) $id;
+        $this->id = $id;
 
         return $this;
     }

models/User.php

@@ -54,7 +54,7 @@ final class User extends User\UserRole
 
     protected bool $allowDirtyClose = false;
 
-    protected ?string $contentLanguages = null;
+    protected ?string $contentLanguages = '';
 
     protected ?string $activePerspective = null;
 
@@ -66,9 +66,9 @@ final class User extends User\UserRole
 
     protected int $lastLogin;
 
-    protected string $keyBindings;
+    protected ?string $keyBindings = null;
 
-    protected array $twoFactorAuthentication;
+    protected array $twoFactorAuthentication = [];
 
     public function getPassword(): ?string
     {