TASK: Correctly mark nullable method parameters as nullable

Neos.Cache/Classes/Backend/AbstractBackend.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -61,7 +62,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 +145,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -117,7 +118,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -57,7 +58,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -148,7 +149,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);
@@ -476,6 +477,6 @@ protected function getEntryIdentifierFromFilename(string $filename): string
     {
         $cacheEntryFileExtensionLength = strlen($this->cacheEntryFileExtension);
 
-        return $cacheEntryFileExtensionLength === 0 ? $filename : substr($filename, 0, - strlen($this->cacheEntryFileExtension));
+        return $cacheEntryFileExtensionLength === 0 ? $filename : substr($filename, 0, -strlen($this->cacheEntryFileExtension));
     }
 }

Neos.Cache/Classes/Backend/MemcachedBackend.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -199,7 +200,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -41,7 +42,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 +97,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -31,7 +32,7 @@ class NullBackend extends AbstractCacheBackend implements PhpCapableBackendInter
      * @param mixed $propertyValue
      * @return boolean TRUE
      */
-    protected function setProperty(string $propertyName, $propertyValue) : bool
+    protected function setProperty(string $propertyName, $propertyValue): bool
     {
         return true;
     }
@@ -46,7 +47,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -182,7 +183,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();
 
@@ -406,7 +407,7 @@ public function flushByTags(array $tags): int
                 $statementHandle = $this->databaseHandle->prepare('SELECT "identifier" FROM "' . $this->tagsTableName . '" WHERE "context"=? AND "cache"=? AND "tag" IN (' . $tagPlaceholders . ')');
                 $statementHandle->execute(array_merge([$this->context(), $this->cacheIdentifier], $tagList));
                 $result = $statementHandle->fetchAll();
-                $identifiers[]= array_column($result, 'identifier');
+                $identifiers[] = array_column($result, 'identifier');
             }
             $identifiers = array_merge([], ...$identifiers);
 

Neos.Cache/Classes/Backend/RedisBackend.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -109,7 +110,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 +494,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -145,7 +146,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 +494,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Backend;
@@ -45,7 +46,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Frontend;
@@ -56,7 +57,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Frontend;
@@ -92,7 +93,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Frontend;
@@ -37,7 +38,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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Frontend;
@@ -56,7 +57,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/Classes/Psr/SimpleCache/SimpleCache.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Neos\Cache\Psr\SimpleCache;

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Neos\Cache\Tests\Unit\Backend;
 
 include_once(__DIR__ . '/../../BaseTestCase.php');
@@ -37,7 +38,7 @@ class_exists(AbstractBackend::class);
         $className = 'ConcreteBackend_' . md5(uniqid(mt_rand(), true));
         eval('
             class ' . $className . ' extends \Neos\Cache\Backend\AbstractBackend {
-                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 {}
                 public function get(string $entryIdentifier): string {}
                 public function has(string $entryIdentifier): bool {}
                 public function remove(string $entryIdentifier): bool {}

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Neos\Cache\Tests\Unit\Backend;
 
 include_once(__DIR__ . '/../../BaseTestCase.php');
@@ -61,7 +62,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);