Merge remote-tracking branch 'origin/8.1' into 8.2

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

@@ -422,7 +422,7 @@ public function getParent()
             return null;
         }
 
-        return $this->nodeDataRepository->findOneByPath($this->parentPath, $this->workspace);
+        return $this->nodeDataRepository->findOneByPath($this->parentPath, $this->workspace, $this->dimensionValues);
     }
 
     /**

Neos.Fusion/Classes/Service/HtmlAugmenter.php

@@ -58,11 +58,11 @@ public function addAttributes($html, array $attributes, $fallbackTagName = 'div'
      * Detects a unique root tag in the given $html string and returns its DOMNode representation - or NULL if no unique root element could be found
      *
      * @param string $html
-     * @return \DOMNode
+     * @return \DOMNode|null
      */
     protected function getHtmlRootElement($html)
     {
-        $html = trim($html);
+        $html = trim((string)$html);
         if ($html === '') {
             return null;
         }

Neos.Media/Classes/Domain/Model/Image.php

@@ -176,4 +176,19 @@ protected function calculateDimensionsFromResource(PersistentResource $resource)
         $this->width = is_int($imageSize['width']) ? $imageSize['width'] : null;
         $this->height = is_int($imageSize['height']) ? $imageSize['height'] : null;
     }
+
+    /**
+     * Set the asset collections that include this asset and
+     * keeps the attached variants' collections in sync.
+     *
+     * @param Collection $assetCollections
+     * @return void
+     */
+    public function setAssetCollections(Collection $assetCollections)
+    {
+        parent::setAssetCollections($assetCollections);
+        foreach ($this->variants as $variant) {
+            $variant->setAssetCollections($assetCollections);
+        }
+    }
 }

Neos.Media/Classes/Domain/Model/ImageVariant.php

@@ -17,6 +17,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\Exception\InvalidConfigurationException;
+use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\ResourceManagement\Exception;
 use Neos\Flow\ResourceManagement\PersistentResource;
@@ -94,6 +95,12 @@ public function __construct(Image $originalAsset)
         } catch (\Exception $e) {
             // This won't happen, because we create DateTime without any parameters.
         }
+
+        $originalAssetCollections = $originalAsset->getAssetCollections();
+        if ($originalAssetCollections instanceof DependencyProxy) {
+            $originalAssetCollections->_activateDependency();
+        }
+        $this->setAssetCollections($originalAssetCollections);
     }
 
     /**

Neos.Neos/Classes/Controller/Module/Administration/UsersController.php

@@ -505,7 +505,7 @@ protected function assignElectronicAddressOptions(): void
         $electronicAddressUsageTypes = [];
         $translationHelper = new TranslationHelper();
         foreach ($electronicAddress->getAvailableUsageTypes() as $type) {
-            $electronicAddressUsageTypes[$type] = $translationHelper->translate('users.electronicAddress.usage.type.' . $type, $type, [], 'Modules', 'Neos.Neos');
+            $electronicAddressUsageTypes[$type] = $type;
         }
         array_unshift($electronicAddressUsageTypes, '');
         $this->view->assignMultiple([

Neos.Neos/Classes/Service/LinkingService.php

@@ -129,7 +129,7 @@ public function hasSupportedScheme($uri): bool
             $uri = (string)$uri;
         }
 
-        return preg_match(self::PATTERN_SUPPORTED_URIS, $uri) === 1;
+        return $uri !== null && preg_match(self::PATTERN_SUPPORTED_URIS, $uri) === 1;
     }
 
     /**
@@ -142,7 +142,7 @@ public function getScheme($uri): string
             return $uri->getScheme();
         }
 
-        if (preg_match(self::PATTERN_SUPPORTED_URIS, $uri, $matches) === 1) {
+        if ($uri !== null && preg_match(self::PATTERN_SUPPORTED_URIS, $uri, $matches) === 1) {
             return $matches[1];
         }
 

Neos.Neos/Documentation/Appendixes/ChangeLogs/7314.rst

@@ -0,0 +1,179 @@
+`7.3.14 (2023-07-18) <https://github.com/neos/neos-development-collection/releases/tag/7.3.14>`_
+================================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Disable content element wrapping and inline editable for references in content reference list <https://github.com/neos/neos-development-collection/pull/4399>`_
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+The NeosUI tries to initialize the inline editor for rendered references in content reference list. But they are not accessable at this moment. As references shouldn't get edited anyways, we can simple disable the content element wrapping for these references.
+
+Fixes https://github.com/neos/neos-ui/issues/3574
+
+* Packages: ``Neos`` ``NodeTypes.ContentReferences``
+
+`BUGFIX: Disable publish checkmark for new pages in workspace <https://github.com/neos/neos-development-collection/pull/4277>`_
+-------------------------------------------------------------------------------------------------------------------------------
+
+closes `#3991 <https://github.com/neos/neos-development-collection/issues/3991>`_
+
+**Review instructions**
+If the document is new, I show a small disabled checkmark instead of the functioning checkmark. This will force the user to use the checkboxes on the left side to publish changes. 
+This does not solve the underlying problem but it will at least disable the function for Editors. 
+
+<img width="1240" alt="Bildschirmfoto 2023-05-12 um 11 12 21" src="https://github.com/neos/neos-development-collection/assets/91674611/bc7d0f47-a54b-474d-a74a-230eb3a92546">
+
+
+* Packages: ``Neos``
+
+`BUGFIX: Allow string position values in NodeType schema <https://github.com/neos/neos-development-collection/pull/4209>`_
+--------------------------------------------------------------------------------------------------------------------------
+
+The PositionalArraySorter implementation allows string values for the position of nodetypes, tabs, groups and views since a long time but the schema validation showed warnings.
+
+**Review instructions**
+
+Open the ``NodeTypes`` tab in the ``Configuration`` module with the Neos.Demo and the previous validation warnings shouldn't show up anymore.
+
+
+* Packages: ``Neos``
+
+`BUGFIX: Undefined array key "ui" in nodeType creationDialog <https://github.com/neos/neos-development-collection/pull/4288>`_
+------------------------------------------------------------------------------------------------------------------------------
+
+Currently, its not possible to use the shorthand
+```yaml
+    creationDialog:
+      elements:
+        hasFoo:
+          type: boolean
+          # ui: {} # this must be set to an empty array
+```
+
+as there is an unsafe access on the ui property
+> Warning: Undefined array key "ui" in /Data/Temporary/Development/Cache/Code/Flow_Object_Classes/Neos_Neos_NodeTypePostprocessor_DefaultPropertyEditorPostprocessor.php line 110
+
+
+
+regression from `#3473 <https://github.com/neos/neos-development-collection/issues/3473>`_
+
+**Upgrade instructions**
+
+**Review instructions**
+
+
+* Packages: ``Neos``
+
+`BUGFIX: flow command typo in exception in nearestContentCollection method <https://github.com/neos/neos-development-collection/pull/4306>`_
+--------------------------------------------------------------------------------------------------------------------------------------------
+
+**Upgrade instructions**
+
+_None_
+
+**Review instructions**
+
+Command in exception should be start with ``./flow command...`` and not ``flow command...``
+
+!`SCR-20230605-jytx <https://github.com/neos/neos-development-collection/assets/39345336/0d9bb60e-2335-4afa-80e3-1a0ed4942610>`_
+
+
+
+* Packages: ``Neos``
+
+`BUGFIX: CreationDialog hideable elements <https://github.com/neos/neos-development-collection/pull/4297>`_
+-----------------------------------------------------------------------------------------------------------
+
+closes cross repo issue: https://github.com/neos/neos-ui/issues/3483
+
+In the UI it will be once https://github.com/neos/neos-ui/pull/3507 is merged possible to use the ``hidden`` property in the node creation dialog
+
+```yaml
+ui:
+  creationDialog:
+    elements:
+      hiddenProperty:
+        type: string
+        ui:
+          hidden: true
+```
+
+This change adjusts neos creationDialogPostprocessor so that creationDialog items that are generated from properties via ``showInCreationDialog`` will have the hidden property copied
+
+```yaml
+properties:
+  hiddenProperty:
+    type: string
+    ui:
+      showInCreationDialog: true
+      inspector:
+        hidden: true
+```
+
+**Upgrade instructions**
+
+**Review instructions**
+
+
+* Packages: ``ContentRepository`` ``Fusion.Afx`` ``Neos``
+
+`TASK: add default value for generatorName at kickstart command in SiteKickstarter <https://github.com/neos/neos-development-collection/pull/4214>`_
+----------------------------------------------------------------------------------------------------------------------------------------------------
+
+We tried to reproduce #4053.
+We can't reproduce this issue, but while reproducing we found a flow command prompt, without a default value.
+
+The command ``flow kickstart:site AnySite.Site`` asks for a site generator.
+We added a default value by adding: 
+```php
+array_key_first($selection)
+```
+
+**Review instructions**
+At https://github.com/neos/neos-development-collection/blob/`79dd4e1a26b7ffceb80cc628fdbe570ff6013b16 <https://github.com/neos/neos-development-collection/commit/79dd4e1a26b7ffceb80cc628fdbe570ff6013b16>``_/Neos.CliSetup/Classes/Command/SetupCommandController.php#L165 ``array_key_last`` is used. Should we use ``array_key_last`` too or is ``array_key_first` fine for it?
+
+
+* Packages: ``SiteKickstarter``
+
+`TASK: PHP 8.1 deprecations compatibility <https://github.com/neos/neos-development-collection/pull/4352>`_
+-----------------------------------------------------------------------------------------------------------
+
+This tweaks the code so that it runs without deprecations on PHP 8.1.
+
+**Upgrade instructions**
+
+None.
+
+**Review instructions**
+
+None.
+
+
+* Packages: ``Fusion`` ``Neos``
+
+`TASK: Change variablename in Neos Fusion documentation <https://github.com/neos/neos-development-collection/pull/4367>`_
+-------------------------------------------------------------------------------------------------------------------------
+
+Now use "myString" in documentation, because the return value is a string and not an array. This can lead to confusion under certain circumstances.
+
+**Upgrade instructions**
+
+**Review instructions**
+
+
+* Packages: ``Neos``
+
+`TASK: Apply fixes from StyleCI <https://github.com/neos/neos-development-collection/pull/4138>`_
+-------------------------------------------------------------------------------------------------
+
+This pull request applies code style fixes from an analysis carried out by `StyleCI <https://github.styleci.io>`_.
+
+---
+
+For more information, click `here <https://github.styleci.io/analyses/o72VmP>`_.
+
+* Packages: ``Neos`` ``ContentRepository`` ``Fusion.Afx`` ``Fusion`` ``Media`` ``SiteKickstarter``
+
+`Detailed log <https://github.com/neos/neos-development-collection/compare/7.3.13...7.3.14>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~