Merge pull request #3433 from dlubitz/task/mark-nullable-method-param…

…eters-as-nullable TASK: Correctly mark nullable method parameters as nullable
neos · Jan 17, 2025 · 98ff7ad · 98ff7ad
2 parents 9dd959b + 07499c2
commit 98ff7ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Neos.Flow/Classes/Mvc/Controller/AbstractController.php b/Neos.Flow/Classes/Mvc/Controller/AbstractController.php
@@ -199,7 +199,7 @@ public function addFlashMessage($messageBody, $messageTitle = '', $severity = Er
      * @see redirect()
      * @api
      */
-    protected function forward(string $actionName, string $controllerName = null, string $packageKey = null, array $arguments = []): never
+    protected function forward(string $actionName, ?string $controllerName = null, ?string $packageKey = null, array $arguments = []): never
     {
         $nextRequest = clone $this->request;
         $nextRequest->setControllerActionName($actionName);
@@ -269,7 +269,7 @@ protected function forwardToRequest(ActionRequest $request): never
      * @see forward()
      * @api
      */
-    protected function redirect(string $actionName, ?string $controllerName = null, ?string $packageKey = null, array $arguments = [], int $delay = 0, int $statusCode = 303, string $format = null): never
+    protected function redirect(string $actionName, ?string $controllerName = null, ?string $packageKey = null, array $arguments = [], int $delay = 0, int $statusCode = 303, ?string $format = null): never
     {
         if ($packageKey !== null && str_contains($packageKey, '\\') !== false) {
             [$packageKey, $subpackageKey] = explode('\\', $packageKey, 2);

diff --git a/Neos.Flow/Classes/Reflection/ReflectionService.php b/Neos.Flow/Classes/Reflection/ReflectionService.php
@@ -946,7 +946,7 @@ public function getPropertyNamesByAnnotation(string $className, string $annotati
      * @return array<object>
      * @api
      */
-    public function getPropertyAnnotations(string $className, string $propertyName, string $annotationClassName = null): array
+    public function getPropertyAnnotations(string $className, string $propertyName, ?string $annotationClassName = null): array
     {
         $className = $this->prepareClassReflectionForUsage($className);
         if (!isset($this->classReflectionData[$className][self::DATA_CLASS_PROPERTIES][$propertyName][self::DATA_PROPERTY_ANNOTATIONS])) {

diff --git a/Neos.Flow/Classes/Session/Session.php b/Neos.Flow/Classes/Session/Session.php
@@ -91,7 +91,7 @@ public static function create(): self
         return new static();
     }
 
-    public static function createRemote(string $sessionIdentifier, string $storageIdentifier, int $lastActivityTimestamp = null, array $tags): self
+    public static function createRemote(string $sessionIdentifier, string $storageIdentifier, ?int $lastActivityTimestamp = null, array $tags = []): self
     {
         $session = new static();
         $session->sessionMetaData = new SessionMetaData(