Skip to content

Move admin_audit to proper event listeners v2 #47865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 8 commits into from
Sep 13, 2024
Merged

Move admin_audit to proper event listeners v2 #47865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2150bd
feat: Add mimetype into BeforePreviewFetchedEvent event
tcitworld Mar 13, 2023
82ba7d7
chore: Code cleanup in lib/private/Console/Application
tcitworld Mar 13, 2023
986a3d4
feat(user_ldap): Introduce user id assigned typed events for LDAP usage
CarlSchwan Mar 13, 2023
f532d3b
feat(admin_audit): Move admin_audit hooks to modern event listeners
tcitworld Mar 13, 2023
ec37338
chore(admin_audit): Fix License headers on new files
come-nc Sep 10, 2024
957ac81
fix(admin_audit): Remove now unused methods and classes
come-nc Sep 10, 2024
7d881b1
chore: Add descriptions for new events and fix copyright year
come-nc Sep 10, 2024
d767455
fix: Fix phpdoc wording
come-nc Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: Add mimetype into BeforePreviewFetchedEvent event 
Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@tcitworld @come-nc
tcitworld authored and come-nc committed Sep 10, 2024
commit c2150bd0795ba05e1ec94734b12350f544b08ad4
1 change: 1 addition & 0 deletions lib/private/Preview/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public function getPreview(File $file, $width = -1, $height = -1, $crop = false,
$height,
$crop,
$mode,
$mimeType,
));

// since we only ask for one preview, and the generate method return the last one it created, it returns the one we want
Expand Down
17 changes: 13 additions & 4 deletions lib/public/Preview/BeforePreviewFetchedEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@
*
* @since 25.0.1
* @since 28.0.0 the constructor arguments ``$width``, ``$height``, ``$crop`` and ``$mode`` are no longer nullable.
* @since 31.0.0 the constructor arguments ``$mimeType`` was added
*/
class BeforePreviewFetchedEvent extends \OCP\EventDispatcher\Event {
/**
* @since 25.0.1
*/
public function __construct(
private Node $node,
/** @deprecated 28.0.0 null deprecated **/
/** @deprecated 28.0.0 passing null is deprecated **/
private ?int $width = null,
/** @deprecated 28.0.0 null deprecated **/
/** @deprecated 28.0.0 passing null is null deprecated **/
private ?int $height = null,
/** @deprecated 28.0.0 null deprecated **/
/** @deprecated 28.0.0 passing null is null deprecated **/
private ?bool $crop = null,
/** @deprecated 28.0.0 null deprecated **/
/** @deprecated 28.0.0 passing null is null deprecated **/
private ?string $mode = null,
private ?string $mimeType = null,
) {
parent::__construct();
}
Expand Down Expand Up @@ -71,4 +73,11 @@ public function isCrop(): ?bool {
public function getMode(): ?string {
return $this->mode;
}

/**
* @since 31.0.0
*/
public function getMimeType(): ?string {
return $this->mimeType;
}
}
12 changes: 6 additions & 6 deletions tests/lib/Preview/GeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function testGetCachedPreview() {

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL));
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));

$result = $this->generator->getPreview($file, 100, 100);
$this->assertSame($previewFile, $result);
Expand Down Expand Up @@ -219,7 +219,7 @@ public function testGetNewPreview() {

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL));
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));

$result = $this->generator->getPreview($file, 100, 100);
$this->assertSame($previewFile, $result);
Expand Down Expand Up @@ -258,7 +258,7 @@ public function testInvalidMimeType() {

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER));
->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));

$this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
}
Expand Down Expand Up @@ -295,7 +295,7 @@ public function testReturnCachedPreviewsWithoutCheckingSupportedMimetype() {

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER));
->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));

$result = $this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
$this->assertSame($preview, $result);
Expand Down Expand Up @@ -323,7 +323,7 @@ public function testNoProvider() {

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL));
->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));

$this->expectException(NotFoundException::class);
$this->generator->getPreview($file, 100, 100);
Expand Down Expand Up @@ -448,7 +448,7 @@ public function testCorrectSize($maxX, $maxY, $reqX, $reqY, $crop, $mode, $expec

$this->eventDispatcher->expects($this->once())
->method('dispatchTyped')
->with(new BeforePreviewFetchedEvent($file, $reqX, $reqY, $crop, $mode));
->with(new BeforePreviewFetchedEvent($file, $reqX, $reqY, $crop, $mode, null));

$result = $this->generator->getPreview($file, $reqX, $reqY, $crop, $mode);
if ($expectedX === $maxX && $expectedY === $maxY) {
Expand Down