Merge remote-tracking branch 'upstream/9.0' into task/e2e-tests-on-9-0

neos · Aug 2, 2023 · 27c6bb4 · 27c6bb4
2 parents 3f2f886 + 375b20a
commit 27c6bb4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -155,7 +155,7 @@ public function indexAction(string $node = null)
             $this->redirectToUri($this->uriBuilder->uriFor('index', [], 'Login', 'Neos.Neos'));
         }
 
-        $backendControllerInternals = $this->contentRepositoryRegistry->getService(
+        $backendControllerInternals = $this->contentRepositoryRegistry->buildService(
             $siteDetectionResult->contentRepositoryId,
             new BackendControllerInternalsFactory()
         );

diff --git a/Classes/Fusion/Helper/ContentDimensionsHelper.php b/Classes/Fusion/Helper/ContentDimensionsHelper.php
@@ -34,7 +34,7 @@ class ContentDimensionsHelper implements ProtectedContextAwareInterface
      */
     public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId): array
     {
-        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->getService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
+        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->buildService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
         assert($contentDimensionHelperInternals instanceof ContentDimensionsHelperInternals);
         $contentDimensionSource = $contentDimensionHelperInternals->contentDimensionSource;
 
@@ -70,7 +70,7 @@ public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId
      */
     public function allowedPresetsByName(DimensionSpacePoint $dimensions, ContentRepositoryId $contentRepositoryId): array
     {
-        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->getService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
+        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->buildService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
         $contentDimensionSource = $contentDimensionHelperInternals->contentDimensionSource;
 
         // TODO: re-implement this here; currently EVERYTHING is allowed!!

diff --git a/Resources/Private/Translations/nl/Main.xlf b/Resources/Private/Translations/nl/Main.xlf
@@ -517,7 +517,7 @@
       </trans-unit>
       <trans-unit id="ckeditor__toolbar__link__formatOptions" xml:space="preserve">
                 <source>Format options</source>
-        <target state="needs-translation">Opmaakopties</target>
+        <target state="translated">Opmaakopties</target>
       </trans-unit>
     </body>
   </file>