From bd04cd1261d8da114e3aedd0170e3e6da4cebd53 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 12 May 2020 21:59:05 +0200
Subject: [PATCH] [TASK] Add new file object to AfterFileCopiedEvent
The PSR-14 event "AfterFileCopiedEvent" in FAL now also
has the possibility to return the newly created file
and the identifier.
Resolves: #91373
Releases: master
Change-Id: I08a01a0424e37fe2f010d2894d41a14628bdc950
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64478
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Susanne Moog <look@susi.dev>
---
.../Resource/Event/AfterFileCopiedEvent.php | 24 ++++++++++++++++++-
.../core/Classes/Resource/ResourceStorage.php | 2 +-
...R-14BasedEventsForFileAbstractionLayer.rst | 3 +++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/core/Classes/Resource/Event/AfterFileCopiedEvent.php b/typo3/sysext/core/Classes/Resource/Event/AfterFileCopiedEvent.php
index f13fc17037a9..0e30eeae8158 100644
--- a/typo3/sysext/core/Classes/Resource/Event/AfterFileCopiedEvent.php
+++ b/typo3/sysext/core/Classes/Resource/Event/AfterFileCopiedEvent.php
@@ -38,10 +38,22 @@ final class AfterFileCopiedEvent
*/
private $folder;
- public function __construct(FileInterface $file, Folder $folder)
+ /**
+ * @var string
+ */
+ private $newFileIdentifier;
+
+ /**
+ * @var FileInterface|null
+ */
+ private $newFile;
+
+ public function __construct(FileInterface $file, Folder $folder, string $newFileIdentifier, ?FileInterface $newFile)
{
$this->file = $file;
$this->folder = $folder;
+ $this->newFileIdentifier = $newFileIdentifier;
+ $this->newFile = $newFile;
}
public function getFile(): FileInterface
@@ -53,4 +65,14 @@ final class AfterFileCopiedEvent
{
return $this->folder;
}
+
+ public function getNewFileIdentifier(): string
+ {
+ return $this->newFileIdentifier;
+ }
+
+ public function getNewFile(): ?FileInterface
+ {
+ return $this->newFile;
+ }
}
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index b5f316471291..dcb46901b82a 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -1949,7 +1949,7 @@ class ResourceStorage implements ResourceStorageInterface
$newFileObject = $this->getResourceFactoryInstance()->getFileObjectByStorageAndIdentifier($this->getUid(), $newFileObjectIdentifier);
$this->eventDispatcher->dispatch(
- new AfterFileCopiedEvent($file, $targetFolder)
+ new AfterFileCopiedEvent($file, $targetFolder, $newFileObjectIdentifier, $newFileObject)
);
return $newFileObject;
}
diff --git a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89577-NewPSR-14BasedEventsForFileAbstractionLayer.rst b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89577-NewPSR-14BasedEventsForFileAbstractionLayer.rst
index 25111761dc37..fcce14114ddf 100644
--- a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89577-NewPSR-14BasedEventsForFileAbstractionLayer.rst
+++ b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89577-NewPSR-14BasedEventsForFileAbstractionLayer.rst
@@ -63,6 +63,9 @@ it is highly encouraged to migrate to the new PSR-14 based events.
In addition, all Core hooks using these events have been migrated to new PSR-14 events,
all new Events have a description when to use them and what the benefits are.
+The Event `AfterFileCopiedEvent` in addition also contains the newly created File
+object.
+
Have a look at the new PHP classes to understand the Events and to learn more about PSR-14.
.. index:: FAL, PHP-API, ext:core
--
GitLab