MERGE: Merge branch '7.3' into 8.0

# Conflicts:
#	Neos.Neos/Documentation/References/EelHelpersReference.rst
#	Neos.Neos/Documentation/References/FlowQueryOperationReference.rst
#	Neos.Neos/Documentation/References/Signals/ContentRepository.rst
#	Neos.Neos/Documentation/References/Signals/Flow.rst
#	Neos.Neos/Documentation/References/Signals/Media.rst
#	Neos.Neos/Documentation/References/Signals/Neos.rst
#	Neos.Neos/Documentation/References/Validators/Flow.rst
#	Neos.Neos/Documentation/References/Validators/Media.rst
#	Neos.Neos/Documentation/References/Validators/Party.rst
#	Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst
#	Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
#	Neos.Neos/Documentation/References/ViewHelpers/Form.rst
#	Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst
#	Neos.Neos/Documentation/References/ViewHelpers/Media.rst
#	Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
#	Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst

.readthedocs.yaml

@@ -0,0 +1,26 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: Neos.Neos/Documentation/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+  - epub
+
+# Optionally declare the Python requirements required to build your docs
+python:
+  install:
+    - requirements: Neos.Neos/Documentation/requirements.txt

Neos.ContentRepository/Classes/Domain/Model/NodeType.php

@@ -435,10 +435,8 @@ public function getProperties()
      */
     public function getPropertyType($propertyName)
     {
-        if (!isset($this->fullConfiguration['properties']) || !isset($this->fullConfiguration['properties'][$propertyName]) || !isset($this->fullConfiguration['properties'][$propertyName]['type'])) {
-            return 'string';
-        }
-        return $this->fullConfiguration['properties'][$propertyName]['type'];
+        $this->initialize();
+        return $this->fullConfiguration['properties'][$propertyName]['type'] ?? 'string';
     }
 
     /**
@@ -502,7 +500,7 @@ public function getAutoCreatedChildNodes()
      */
     public function hasAutoCreatedChildNode(NodeName $nodeName): bool
     {
-        return isset($this->fullConfiguration['childNodes'][(string)$nodeName]);
+        return isset($this->getAutoCreatedChildNodes()[(string)$nodeName]);
     }
 
     /**
@@ -512,9 +510,7 @@ public function hasAutoCreatedChildNode(NodeName $nodeName): bool
      */
     public function getTypeOfAutoCreatedChildNode(NodeName $nodeName): ?NodeType
     {
-        return isset($this->fullConfiguration['childNodes'][(string)$nodeName]['type'])
-            ? $this->nodeTypeManager->getNodeType($this->fullConfiguration['childNodes'][(string)$nodeName]['type'])
-            : null;
+        return $this->getAutoCreatedChildNodes()[(string)$nodeName] ?? null;
     }
 
 

Neos.Fusion/Classes/Core/RuntimeConfiguration.php

@@ -64,6 +64,10 @@ public function forPath(string $fusionPath): array
             return $this->pathCache[$fusionPath]['c'];
         }
 
+        if ($fusionPath === '') {
+            throw new Exception('Fusion path cannot be empty.', 1695308681);
+        }
+
         // Find longest prefix of path that already is in path cache
         $pathUntilNow = '';
         $fusionPathLength = strlen($fusionPath);

Neos.Media.Browser/Configuration/Settings.yaml

@@ -16,7 +16,7 @@ Neos:
         - 'resource://Neos.Media.Browser/Public/Libraries/bootstrap/bootstrap-components.js'
         - 'resource://Neos.Media.Browser/Public/JavaScript/media-browser.js'
       styles:
-        - 'resource://Neos.Neos/Public/Styles/Neos.css'
+        - 'resource://Neos.Neos/Public/Styles/Main.css'
         - 'resource://Neos.Media.Browser/Public/Styles/MediaBrowser.css'
         - 'resource://Neos.Media.Browser/Public/Styles/Main.css'
 

Neos.Media/Classes/Domain/Service/AssetSourceService.php

@@ -175,7 +175,7 @@ private function initialize(): void
         if ($this->assetSources === []) {
             foreach ($this->assetSourcesConfiguration as $assetSourceIdentifier => $assetSourceConfiguration) {
                 if (is_array($assetSourceConfiguration)) {
-                    $this->assetSources[$assetSourceIdentifier] = new $assetSourceConfiguration['assetSource']($assetSourceIdentifier, $assetSourceConfiguration['assetSourceOptions'] ?? []);
+                    $this->assetSources[$assetSourceIdentifier] = $assetSourceConfiguration['assetSource']::createFromConfiguration($assetSourceIdentifier, $assetSourceConfiguration['assetSourceOptions'] ?? []);
                 }
             }
         }

Neos.Media/Documentation/.readthedocs.yaml

@@ -0,0 +1,26 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: Neos.Media/Documentation/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+  - epub
+
+# Optionally declare the Python requirements required to build your docs
+python:
+  install:
+    - requirements: Neos.Media/Documentation/requirements.txt

Neos.Neos/.gitignore

@@ -3,7 +3,6 @@
 /Tests/Behavior/behat.yml
 /Resources/Public/Styles/Error.css
 /Resources/Public/Styles/Login.css
-/Resources/Public/Styles/Neos.css
 /Resources/Public/Styles/RawContentMode.css
 
 #

Neos.Neos/Readme.rst

@@ -18,3 +18,21 @@ Contribute
 If you want to contribute to Neos, please have a look at
 https://github.com/neos/neos-development-collection - it is the repository
 used for development and all pull requests should go into it.
+
+
+Build frontend assets
+---------------------
+
+If you need to rebuild the frontend assets you need to run the following commands within the
+Neos.Neos package directory:
+
+For develpment::
+
+  yarn
+  yarn build
+
+For production::
+
+  yarn
+  yarn build:production
+