TASK: Upmerges

.github/dependabot.yml

@@ -1,8 +1,23 @@
 version: 2
 updates:
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "09:00"
-  open-pull-requests-limit: 10
+
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "7.3"
+    open-pull-requests-limit: 0
+    labels:
+      - "security"
+
+  # Maintain dependencies for Composer
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "09:00"
+    target-branch: "7.3"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"

.github/workflows/add-pr-labels.yml

@@ -1,7 +1,7 @@
 name: Add Labels to Pull Request
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, reopened, synchronize, edited]
 
 jobs:
@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Maybe remove base branch label
         if: github.event.action == 'edited' && github.event.changes.base.ref.from != ''
         uses: actions-ecosystem/action-remove-labels@v1

Neos.ContentRepository.Core/Classes/NodeType/NodeType.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\Core\NodeType;
 
 /*
  * This file is part of the Neos.ContentRepository package.
@@ -10,9 +13,6 @@
  * source code.
  */
 
-declare(strict_types=1);
-
-namespace Neos\ContentRepository\Core\NodeType;
 
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;

Neos.ContentRepository.NodeAccess/Configuration/Testing/NodeTypes.yaml

@@ -199,3 +199,9 @@
       type: string
     someDate:
       type: DateTime
+
+'Neos.ContentRepository.Testing:NodeTypeWithPlainLabel':
+  label: 'Test nodetype'
+
+'Neos.ContentRepository.Testing:NodeTypeWithEelExpressionLabel':
+  label: '${"Test" + " " + "nodetype"}'

Neos.ContentRepository/Classes/Migration/Service/MigrationGeneratorService.php

@@ -0,0 +1,58 @@
+<?php
+namespace Neos\ContentRepository\Migration\Service;
+
+/*
+ * This file is part of the Neos.ContentRepository package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Package\Exception\UnknownPackageException;
+use Neos\Flow\Package\PackageManager;
+use Neos\Utility\Exception\FilesException;
+use Neos\Utility\Files;
+
+/**
+ * Service for the Migration generator
+ *
+ */
+class MigrationGeneratorService
+{
+    /**
+     * @Flow\Inject
+     */
+    protected PackageManager $packageManager;
+
+    /**
+     * Creates a node migration for the given $packageKey
+     *
+     * @param string $packageKey the package key
+     * @return string
+     * @throws UnknownPackageException
+     * @throws FilesException
+     */
+    public function generateBoilerplateMigrationFileInPackage(string $packageKey): string
+    {
+        $templatePath = 'resource://Neos.ContentRepository/Private/Generator/Migrations/ContentRepository/NodeMigrationTemplate.yaml.tmpl';
+        $nodeMigrationPath = Files::concatenatePaths([$this->packageManager->getPackage($packageKey)->getPackagePath(), 'Migrations/ContentRepository']) . '/';
+
+        $timeStamp = (new \DateTimeImmutable())->format('YmdHis');
+        $nodeMigrationFileName = 'Version' . $timeStamp . '.yaml';
+
+        $targetPathAndFilename = $nodeMigrationPath . $nodeMigrationFileName;
+        $fileContent = file_get_contents($templatePath);
+
+        if (!is_dir(dirname($targetPathAndFilename))) {
+            Files::createDirectoryRecursively(dirname($targetPathAndFilename));
+        }
+
+        file_put_contents($targetPathAndFilename, $fileContent);
+
+        return $packageKey . '/Migrations/ContentRepository/' . $nodeMigrationFileName;
+    }
+}

Neos.ContentRepository/Resources/Private/Generator/Migrations/ContentRepository/NodeMigrationTemplate.yaml.tmpl

@@ -0,0 +1,12 @@
+#############################################################################################################################################################################
+# For more information about node migrations in Neos, checkout the documentation: https://neos.readthedocs.io/en/stable/References/NodeMigrations.html?highlight=migrations #
+#############################################################################################################################################################################
+up:
+  comments: 'Migration description'
+  migration:
+    -
+      filters:
+        -
+
+down:
+  comments: 'No down migration available'

Neos.ContentRepositoryRegistry/Classes/Configuration/NodeTypeEnrichmentService.php

@@ -29,7 +29,6 @@
  */
 class NodeTypeEnrichmentService
 {
-
     /**
      * @Flow\Inject
      * @var ResourceManager

Neos.ContentRepositoryRegistry/Classes/Configuration/NodeTypesLoader.php

@@ -14,7 +14,6 @@
 
 class NodeTypesLoader implements LoaderInterface
 {
-
     /**
      * @var YamlSource
      */

Neos.ContentRepositoryRegistry/Classes/NodeLabel/ExpressionBasedNodeLabelGenerator.php

@@ -68,11 +68,14 @@ public function initializeObject()
     }
 
     /**
-     * Render a node label
+     * Render a node label based on an eel expression or return the expression if it is not valid eel.
      * @throws \Neos\Eel\Exception
      */
     public function getLabel(Node $node): string
     {
+        if (Utility::parseEelExpression($this->getExpression()) === null) {
+            return $this->getExpression();
+        }
         return (string)Utility::evaluateEelExpression($this->getExpression(), $this->eelEvaluator, ['node' => $node], $this->defaultContextConfiguration);
     }
 }

Neos.Fusion/Classes/Core/FusionConfiguration.php

@@ -0,0 +1,40 @@
+<?php
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+/*
+ * This file is part of the Neos.Fusion package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+/**
+ * This holds the parsed Fusion Configuration and can be used to pass it to the Runtime via
+ * {@see RuntimeFactory::createFromConfiguration()}
+ * The contents of this DTO are internal and can change at any time!
+ */
+final class FusionConfiguration
+{
+    /** @internal */
+    protected function __construct(
+        private array $fusionConfiguration
+    ) {
+    }
+
+    /** @internal */
+    public static function fromArray(array $fusionConfiguration)
+    {
+        return new static($fusionConfiguration);
+    }
+
+    /** @internal */
+    public function toArray()
+    {
+        return $this->fusionConfiguration;
+    }
+}

Neos.Fusion/Classes/Core/FusionSourceCode.php

@@ -0,0 +1,58 @@
+<?php
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+/*
+ * This file is part of the Neos.Fusion package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Neos\Fusion;
+
+final class FusionSourceCode
+{
+    protected function __construct(
+        private ?string $filePath,
+        private string|\Closure $sourceCodeOrFactory,
+    ) {
+    }
+
+    public static function fromString(string $string): self
+    {
+        return new static(null, $string);
+    }
+
+    public static function fromFilePath(string $filePath): self
+    {
+        if (is_readable($filePath) === false) {
+            throw new Fusion\Exception("Trying to read Fusion source code from file, but '$filePath' is not readable.", 1657963790);
+        }
+        return new static($filePath, fn () => file_get_contents($filePath));
+    }
+
+    /**
+     * Watch out for unexpected behaviour {@link https://github.com/neos/neos-development-collection/issues/3835}
+     */
+    public static function fromDangerousPotentiallyDifferingSourceCodeAndFilePath(string $sourceCode, string $filePath): self
+    {
+        return new static($filePath, $sourceCode);
+    }
+
+    public function getSourceCode(): string
+    {
+        return $this->sourceCodeOrFactory instanceof \Closure
+            ? $this->sourceCodeOrFactory = ($this->sourceCodeOrFactory)()
+            : $this->sourceCodeOrFactory;
+    }
+
+    public function getFilePath(): ?string
+    {
+        return $this->filePath;
+    }
+}

Neos.Fusion/Classes/Core/FusionSourceCodeCollection.php

@@ -0,0 +1,92 @@
+<?php
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+/*
+ * This file is part of the Neos.Fusion package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+/** @api */
+final class FusionSourceCodeCollection implements \IteratorAggregate, \Countable
+{
+    /** @var array<int, FusionSourceCode> */
+    private array $fusionCodeCollection;
+
+    /** @param $fusionSourceCode array<int, FusionSourceCode> */
+    public function __construct(FusionSourceCode ...$fusionSourceCode)
+    {
+        $this->fusionCodeCollection = self::deduplicateItemsAndKeepLast($fusionSourceCode);
+    }
+
+    public static function fromFilePath(string $filePath): self
+    {
+        return new static(FusionSourceCode::fromFilePath($filePath));
+    }
+
+    public static function fromString(string $string): self
+    {
+        return new static(FusionSourceCode::fromString($string));
+    }
+
+    public static function tryFromFilePath(string $filePath): self
+    {
+        if (!is_readable($filePath)) {
+            return static::empty();
+        }
+        return static::fromFilePath($filePath);
+    }
+
+    public static function tryFromPackageRootFusion(string $packageKey): self
+    {
+        $fusionPathAndFilename = sprintf('resource://%s/Private/Fusion/Root.fusion', $packageKey);
+        return static::tryFromFilePath($fusionPathAndFilename);
+    }
+
+    public static function empty()
+    {
+        return new static();
+    }
+
+    public function union(FusionSourceCodeCollection $other): self
+    {
+        return new static(...$this->fusionCodeCollection, ...$other->fusionCodeCollection);
+    }
+
+    /** @return \ArrayIterator<int,FusionSourceCode>|FusionSourceCode[] */
+    public function getIterator(): \ArrayIterator
+    {
+        return new \ArrayIterator($this->fusionCodeCollection);
+    }
+
+    public function count(): int
+    {
+        return count($this->fusionCodeCollection);
+    }
+
+    /**
+     * @param array<int, FusionSourceCode> $fusionSourceCode
+     * @return array<int, FusionSourceCode>
+     */
+    private static function deduplicateItemsAndKeepLast(array $fusionSourceCode): array
+    {
+        $deduplicated = [];
+        $includedFilePathsAndTheirPreviousIndex = [];
+        foreach ($fusionSourceCode as $index => $sourceCode) {
+            if (isset($includedFilePathsAndTheirPreviousIndex[$sourceCode->getFilePath()])) {
+                unset($deduplicated[$includedFilePathsAndTheirPreviousIndex[$sourceCode->getFilePath()]]);
+            }
+            $deduplicated[$index] = $sourceCode;
+            if ($sourceCode->getFilePath()) {
+                $includedFilePathsAndTheirPreviousIndex[$sourceCode->getFilePath()] = $index;
+            }
+        }
+        return array_values($deduplicated);
+    }
+}

Neos.Fusion/Classes/Core/ObjectTreeParser/MergedArrayTree.php

@@ -19,7 +19,7 @@
 class MergedArrayTree
 {
     public function __construct(
-        protected array $tree = []
+        protected array $tree
     ) {
     }