Merge branch '8.3' into task/drop-runbare-override

# Conflicts:
#	Neos.FluidAdaptor/Tests/Functional/View/Fixtures/View/StandaloneView.php

Author: kdambekalns

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
         # see https://mariadb.com/kb/en/mariadb-server-release-dates/
         # this should be a current release, e.g. the LTS version
         mariadb-versions: ['10.6']
@@ -75,7 +75,7 @@ jobs:
         working-directory: .
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ${{ env.FLOW_FOLDER }}
 
@@ -106,7 +106,7 @@ jobs:
           mysql root password: 'neos'
 
       - name: Checkout development distribution
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: neos/flow-development-distribution
           ref: ${{ env.FLOW_TARGET_VERSION }}
@@ -123,7 +123,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/composer

.github/workflows/experimental.yml

@@ -86,7 +86,7 @@ jobs:
         working-directory: .
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ${{ env.FLOW_FOLDER }}
 
@@ -99,7 +99,7 @@ jobs:
           ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on
 
       - name: Checkout development distribution
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: neos/flow-development-distribution
           ref: ${{ env.FLOW_TARGET_VERSION }}
@@ -116,7 +116,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/composer

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();