Skip to content

Commit 82dfd32

Browse files
committedMar 11, 2025
Merge branch '8.3' into 8.4
# Conflicts: # Neos.Neos/Documentation/References/CommandReference.rst # 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 # Neos.Neos/Resources/Private/Translations/fi/Main.xlf # Neos.Neos/Resources/Private/Translations/fi/Modules.xlf # Neos.Neos/Resources/Private/Translations/nl/Modules.xlf
2 parents 404b6d1 + f534ee7 commit 82dfd32

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed
 

‎.readthedocs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 2
77

88
# Set the version of Python and other tools you might need
99
build:
10-
os: ubuntu-20.04
10+
os: ubuntu-lts-latest
1111
tools:
1212
python: "3.9"
1313

‎Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php

+1
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,7 @@ function (Workspace $workspace) {
13341334
}
13351335
}
13361336
$dimensionPositions[] = $workspacePosition;
1337+
$dimensionPositions[] = $node->isRemoved() ? PHP_INT_MAX : PHP_INT_MIN;
13371338

13381339
$identifier = $node->getIdentifier();
13391340
// Yes, it seems to work comparing arrays that way!

‎Neos.Media.Browser/Resources/Private/Translations/nl/Main.xlf

+8
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,14 @@
576576
<source>This asset might contain malicious content!</source>
577577
<target state="translated">Dit bestand kan kwaadaardige inhoud bevatten!</target>
578578
</trans-unit>
579+
<trans-unit id="assetImport.importInProcess" xml:space="preserve">
580+
<source>Import still in process. Please wait.</source>
581+
<target state="translated">Importeren is nog aan de gang. Even geduld.</target>
582+
</trans-unit>
583+
<trans-unit id="assetImport.importInfo" xml:space="preserve">
584+
<source>Asset is being imported. Please wait.</source>
585+
<target state="translated">Het bestand wordt geïmporteerd. Even geduld.</target>
586+
</trans-unit>
579587
</body>
580588
</file>
581589
</xliff>

‎Neos.Media/Classes/Domain/Service/ThumbnailService.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,15 @@ public function getUriForThumbnail(ImageInterface $thumbnail): string
255255
{
256256
$resource = $thumbnail->getResource();
257257
if ($resource) {
258-
return $this->resourceManager->getPublicPersistentResourceUri($resource);
258+
$uri = $this->resourceManager->getPublicPersistentResourceUri($resource);
259+
if ($uri === false) {
260+
throw new ThumbnailServiceException(sprintf(
261+
'Could not generate URI for resource "%s".',
262+
$this->persistenceManager->getIdentifierByObject($resource)
263+
), 1737558490);
264+
}
265+
266+
return $uri;
259267
}
260268

261269
$staticResource = $thumbnail->getStaticResource();

‎Neos.Media/Documentation/.readthedocs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 2
77

88
# Set the version of Python and other tools you might need
99
build:
10-
os: ubuntu-20.04
10+
os: ubuntu-lts-latest
1111
tools:
1212
python: "3.9"
1313

0 commit comments

Comments
 (0)