Merge remote-tracking branch 'origin/8.4' into 9.0

Neos.Cache/Classes/Backend/AbstractBackend.php

@@ -61,7 +61,7 @@ abstract class AbstractBackend implements BackendInterface
      * @param array $options Configuration options - depends on the actual backend
      * @api
      */
-    public function __construct(EnvironmentConfiguration $environmentConfiguration = null, array $options = [])
+    public function __construct(?EnvironmentConfiguration $environmentConfiguration = null, array $options = [])
     {
         $this->environmentConfiguration = $environmentConfiguration;
 
@@ -144,7 +144,7 @@ public function setDefaultLifetime($defaultLifetime): void
      * @param integer $lifetime The lifetime in seconds
      * @return \DateTime The expiry time
      */
-    protected function calculateExpiryTime(int $lifetime = null): \DateTime
+    protected function calculateExpiryTime(?int $lifetime = null): \DateTime
     {
         if ($lifetime === self::UNLIMITED_LIFETIME || ($lifetime === null && $this->defaultLifetime === self::UNLIMITED_LIFETIME)) {
             return new \DateTime(self::DATETIME_EXPIRYTIME_UNLIMITED, new \DateTimeZone('UTC'));

Neos.Cache/Classes/Backend/ApcuBackend.php

@@ -117,7 +117,7 @@ public function getPrefixedIdentifier(string $entryIdentifier): string
      * @throws \InvalidArgumentException if the identifier is not valid
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if (!$this->cache instanceof FrontendInterface) {
             throw new Exception('No cache frontend has been set yet via setCache().', 1232986818);

Neos.Cache/Classes/Backend/BackendInterface.php

@@ -57,7 +57,7 @@ public function getPrefixedIdentifier(string $entryIdentifier): string;
      * @throws \InvalidArgumentException if the identifier is not valid
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void;
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void;
 
     /**
      * Loads data from the cache.

Neos.Cache/Classes/Backend/FileBackend.php

@@ -148,7 +148,7 @@ public function setCache(FrontendInterface $cache): void
      * @throws \InvalidArgumentException
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if ($entryIdentifier !== basename($entryIdentifier)) {
             throw new \InvalidArgumentException('The specified entry identifier must not contain a path segment.', 1282073032);

Neos.Cache/Classes/Backend/MemcachedBackend.php

@@ -199,7 +199,7 @@ public function getPrefixedIdentifier(string $entryIdentifier): string
      * @throws \InvalidArgumentException if the identifier is not valid or the final memcached key is longer than 250 characters
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if (strlen($this->getPrefixedIdentifier($entryIdentifier)) > 250) {
             throw new \InvalidArgumentException('Could not set value. Key more than 250 characters (' . $this->getPrefixedIdentifier($entryIdentifier) . ').', 1232969508);

Neos.Cache/Classes/Backend/MultiBackend.php

@@ -41,7 +41,7 @@ class MultiBackend extends AbstractBackend
     protected ?LoggerInterface $logger = null;
     protected ?ThrowableStorageInterface $throwableStorage = null;
 
-    public function __construct(EnvironmentConfiguration $environmentConfiguration = null, array $options = [])
+    public function __construct(?EnvironmentConfiguration $environmentConfiguration = null, array $options = [])
     {
         parent::__construct($environmentConfiguration, $options);
 
@@ -96,7 +96,7 @@ protected function buildSubBackend(string $backendClassName, array $backendOptio
     /**
      * @throws Throwable
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         $this->prepareBackends();
         foreach ($this->backends as $backend) {

Neos.Cache/Classes/Backend/NullBackend.php

@@ -46,7 +46,7 @@ protected function setProperty(string $propertyName, $propertyValue) : bool
      * @return void
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
     }
 

Neos.Cache/Classes/Backend/PdoBackend.php

@@ -182,7 +182,7 @@ protected function setBatchSize(int $batchSize): void
      * @throws FilesException
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         $this->connect();
 

Neos.Cache/Classes/Backend/RedisBackend.php

@@ -109,7 +109,7 @@ public function __construct(EnvironmentConfiguration $environmentConfiguration,
      * @throws CacheException
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if ($this->isFrozen()) {
             throw new \RuntimeException(sprintf('Cannot add or modify cache entry because the backend of cache "%s" is frozen.', $this->cacheIdentifier), 1323344192);
@@ -493,7 +493,7 @@ public function setBatchSize(int|string $batchSize): void
         $this->batchSize = (int)$batchSize;
     }
 
-    public function setRedis(\Redis $redis = null): void
+    public function setRedis(?\Redis $redis = null): void
     {
         if ($redis !== null) {
             $this->redis = $redis;

Neos.Cache/Classes/Backend/SimpleFileBackend.php

@@ -145,7 +145,7 @@ public function getCacheDirectory(): string
      * @throws \InvalidArgumentException
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if ($entryIdentifier !== basename($entryIdentifier)) {
             throw new \InvalidArgumentException('The specified entry identifier must not contain a path segment.', 1334756735);
@@ -493,7 +493,7 @@ protected function verifyCacheDirectory(): void
      * @param int|null $maxlen
      * @return string|false The contents of the cache file or false on error
      */
-    protected function readCacheFile(string $cacheEntryPathAndFilename, int $offset = 0, int $maxlen = null)
+    protected function readCacheFile(string $cacheEntryPathAndFilename, int $offset = 0, ?int $maxlen = null)
     {
         for ($i = 0; $i < 3; $i++) {
             $data = false;

Neos.Cache/Classes/Backend/TransientMemoryBackend.php

@@ -45,7 +45,7 @@ class TransientMemoryBackend extends IndependentAbstractBackend implements Tagga
      * @throws Exception if no cache frontend has been set.
      * @api
      */
-    public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = null): void
+    public function set(string $entryIdentifier, string $data, array $tags = [], ?int $lifetime = null): void
     {
         if (!$this->cache instanceof FrontendInterface) {
             throw new Exception('No cache frontend has been set yet via setCache().', 1238244992);

Neos.Cache/Classes/Frontend/FrontendInterface.php

@@ -56,7 +56,7 @@ public function getBackend();
      * @return void
      * @api
      */
-    public function set(string $entryIdentifier, $data, array $tags = [], int $lifetime = null);
+    public function set(string $entryIdentifier, $data, array $tags = [], ?int $lifetime = null);
 
     /**
      * Finds and returns data from the cache.

Neos.Cache/Classes/Frontend/PhpFrontend.php

@@ -92,7 +92,7 @@ public function getWrapped(string $entryIdentifier)
      * @throws \Neos\Cache\Exception
      * @api
      */
-    public function set(string $entryIdentifier, $sourceCode, array $tags = [], int $lifetime = null)
+    public function set(string $entryIdentifier, $sourceCode, array $tags = [], ?int $lifetime = null)
     {
         if (!$this->isValidEntryIdentifier($entryIdentifier)) {
             throw new \InvalidArgumentException('"' . $entryIdentifier . '" is not a valid cache entry identifier.', 1264023823);

Neos.Cache/Classes/Frontend/StringFrontend.php

@@ -37,7 +37,7 @@ class StringFrontend extends AbstractFrontend
      * @throws \Neos\Cache\Exception
      * @api
      */
-    public function set(string $entryIdentifier, $string, array $tags = [], int $lifetime = null)
+    public function set(string $entryIdentifier, $string, array $tags = [], ?int $lifetime = null)
     {
         if (!$this->isValidEntryIdentifier($entryIdentifier)) {
             throw new \InvalidArgumentException('"' . $entryIdentifier . '" is not a valid cache entry identifier.', 1233057566);

Neos.Cache/Classes/Frontend/VariableFrontend.php

@@ -56,7 +56,7 @@ public function initializeObject()
      * @throws \Neos\Cache\Exception
      * @api
      */
-    public function set(string $entryIdentifier, $variable, array $tags = [], int $lifetime = null)
+    public function set(string $entryIdentifier, $variable, array $tags = [], ?int $lifetime = null)
     {
         if (!$this->isValidEntryIdentifier($entryIdentifier)) {
             throw new \InvalidArgumentException('"' . $entryIdentifier . '" is not a valid cache entry identifier.', 1233058264);

Neos.Cache/Tests/Unit/Backend/SimpleFileBackendTest.php

@@ -61,7 +61,7 @@ protected function setUp(): void
      * @param FrontendInterface $mockCacheFrontend
      * @return SimpleFileBackend
      */
-    protected function getSimpleFileBackend(array $options = [], FrontendInterface $mockCacheFrontend = null)
+    protected function getSimpleFileBackend(array $options = [], ?FrontendInterface $mockCacheFrontend = null)
     {
         $simpleFileBackend = new SimpleFileBackend($this->mockEnvironmentConfiguration, $options);
 

Neos.Eel/Classes/Helper/ArrayHelper.php

@@ -562,7 +562,7 @@ public function reduce(iterable $array, callable $callback, $initialValue = null
      * @param callable $callback Callback for testing if an element should be included in the result, current value and key will be passed as arguments
      * @return array The array with elements where callback returned true
      */
-    public function filter(iterable $array, callable $callback = null): array
+    public function filter(iterable $array, ?callable $callback = null): array
     {
         if ($array instanceof \Traversable) {
             $array = iterator_to_array($array);

Neos.Error.Messages/Classes/Result.php

@@ -132,7 +132,7 @@ public function addNotice(Notice $notice)
      * @return array<Error>
      * @api
      */
-    public function getErrors(string $messageTypeFilter = null): array
+    public function getErrors(?string $messageTypeFilter = null): array
     {
         return $this->filterMessages($this->errors, $messageTypeFilter);
     }
@@ -144,7 +144,7 @@ public function getErrors(string $messageTypeFilter = null): array
      * @return array<Warning>
      * @api
      */
-    public function getWarnings(string $messageTypeFilter = null): array
+    public function getWarnings(?string $messageTypeFilter = null): array
     {
         return $this->filterMessages($this->warnings, $messageTypeFilter);
     }
@@ -156,7 +156,7 @@ public function getWarnings(string $messageTypeFilter = null): array
      * @return array<Notice>
      * @api
      */
-    public function getNotices(string $messageTypeFilter = null): array
+    public function getNotices(?string $messageTypeFilter = null): array
     {
         return $this->filterMessages($this->notices, $messageTypeFilter);
     }
@@ -168,7 +168,7 @@ public function getNotices(string $messageTypeFilter = null): array
      * @return Error
      * @api
      */
-    public function getFirstError(string $messageTypeFilter = null)
+    public function getFirstError(?string $messageTypeFilter = null)
     {
         $matchingErrors = $this->filterMessages($this->errors, $messageTypeFilter);
         reset($matchingErrors);
@@ -182,7 +182,7 @@ public function getFirstError(string $messageTypeFilter = null)
      * @return Warning
      * @api
      */
-    public function getFirstWarning(string $messageTypeFilter = null)
+    public function getFirstWarning(?string $messageTypeFilter = null)
     {
         $matchingWarnings = $this->filterMessages($this->warnings, $messageTypeFilter);
         reset($matchingWarnings);
@@ -196,7 +196,7 @@ public function getFirstWarning(string $messageTypeFilter = null)
      * @return Notice
      * @api
      */
-    public function getFirstNotice(string $messageTypeFilter = null)
+    public function getFirstNotice(?string $messageTypeFilter = null)
     {
         $matchingNotices = $this->filterMessages($this->notices, $messageTypeFilter);
         reset($matchingNotices);
@@ -213,7 +213,7 @@ public function getFirstNotice(string $messageTypeFilter = null)
      * @return Result
      * @api
      */
-    public function forProperty(string $propertyPath = null): Result
+    public function forProperty(?string $propertyPath = null): Result
     {
         if ($propertyPath === '' || $propertyPath === null) {
             return $this;
@@ -411,7 +411,7 @@ public function getFlattenedNotices(): array
      * @param-out array<string, array<int, mixed>> $result
      * @return void
      */
-    public function flattenTree(string $propertyName, array &$result, array $level = [], string $messageTypeFilter = null)
+    public function flattenTree(string $propertyName, array &$result, array $level = [], ?string $messageTypeFilter = null)
     {
         if (count($this->$propertyName) > 0) {
             $propertyPath = implode('.', $level);
@@ -430,7 +430,7 @@ public function flattenTree(string $propertyName, array &$result, array $level =
      * @param string $messageTypeFilter If specified only messages implementing the given class name are taken into account
      * @return array the filtered message instances
      */
-    protected function filterMessages(array $messages, string $messageTypeFilter = null): array
+    protected function filterMessages(array $messages, ?string $messageTypeFilter = null): array
     {
         if ($messageTypeFilter === null) {
             return $messages;

Neos.Flow.Log/Classes/Backend/AnsiConsoleBackend.php

@@ -83,7 +83,7 @@ public function open(): void
      * @param string $methodName
      * @return void
      */
-    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void
+    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
     {
         if ($severity > $this->severityThreshold) {
             return;

Neos.Flow.Log/Classes/Backend/BackendInterface.php

@@ -42,7 +42,7 @@ public function open(): void;
      * @return void
      * @api
      */
-    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void;
+    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void;
 
     /**
      * Carries out all actions necessary to cleanly close the logging backend, such as

Neos.Flow.Log/Classes/Backend/ConsoleBackend.php

@@ -79,7 +79,7 @@ public function open(): void
      * @return void
      * @api
      */
-    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void
+    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
     {
         if ($severity > $this->severityThreshold) {
             return;

Neos.Flow.Log/Classes/Backend/FileBackend.php

@@ -228,7 +228,7 @@ protected function rotateLogFile(): void
      * @return void
      * @api
      */
-    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void
+    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
     {
         if ($severity > $this->severityThreshold) {
             return;

Neos.Flow.Log/Classes/Backend/JsonFileBackend.php

@@ -29,7 +29,7 @@ class JsonFileBackend extends FileBackend
      * @param string $methodName Name of the method triggering the log (determined automatically if not specified)
      * @return void
      */
-    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void
+    public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
     {
 
         if ($severity > $this->severityThreshold) {

Neos.Flow.Log/Classes/Backend/NullBackend.php

@@ -43,7 +43,7 @@ public function open(): void
      * @return void
      * @api
      */
-    public function append(string $message, int $severity = 1, $additionalData = null, string $packageKey = null, string $className = null, string $methodName = null): void
+    public function append(string $message, int $severity = 1, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
     {
     }
 

Neos.Flow/Classes/Annotations/IgnoreValidation.php

@@ -38,7 +38,7 @@ final class IgnoreValidation
      */
     public $evaluate = false;
 
-    public function __construct(string $argumentName = null, bool $evaluate = false)
+    public function __construct(?string $argumentName = null, bool $evaluate = false)
     {
         $this->argumentName = $argumentName ? ltrim($argumentName, '$') : null;
         $this->evaluate = $evaluate;

Neos.Flow/Classes/Annotations/Validate.php

@@ -47,7 +47,7 @@ final class Validate
      */
     public $validationGroups = ['Default'];
 
-    public function __construct(?string $argumentName = null, string $type = null, array $options = [], ?array $validationGroups = null)
+    public function __construct(?string $argumentName = null, ?string $type = null, array $options = [], ?array $validationGroups = null)
     {
         $this->type = $type;
 

Neos.Flow/Classes/Aop/Advice/AbstractAdvice.php

@@ -66,7 +66,7 @@ class AbstractAdvice implements AdviceInterface
      * @param ObjectManagerInterface $objectManager Only require if a runtime evaluations function is specified
      * @param \Closure $runtimeEvaluator Runtime evaluations function
      */
-    public function __construct(string $aspectObjectName, string $adviceMethodName, ObjectManagerInterface $objectManager = null, \Closure $runtimeEvaluator = null)
+    public function __construct(string $aspectObjectName, string $adviceMethodName, ?ObjectManagerInterface $objectManager = null, ?\Closure $runtimeEvaluator = null)
     {
         $this->aspectObjectName = $aspectObjectName;
         $this->adviceMethodName = $adviceMethodName;