From c2ea56bf0720ef6337af8b4f5a937d77d7776aa7 Mon Sep 17 00:00:00 2001 From: Moritz Ngo Date: Mon, 14 Oct 2024 16:00:42 +0200 Subject: [PATCH 1/5] [BUGFIX] Prevent TypeError when returning public URL This commit fixes a TypeError in `VideoPublicUrlViewHelper::renderStatic()`. The `OnlineMediaHelperInterface::getPublicUrl()` method can return string or null. see https://github.com/TYPO3/typo3/blob/v11.5.40/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperInterface.php#L50-L59 see https://github.com/TYPO3/typo3/blob/v12.4.21/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperInterface.php#L48-L56 --- Classes/ViewHelpers/VideoPublicUrlViewHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/ViewHelpers/VideoPublicUrlViewHelper.php b/Classes/ViewHelpers/VideoPublicUrlViewHelper.php index c2b0517..927fbe9 100644 --- a/Classes/ViewHelpers/VideoPublicUrlViewHelper.php +++ b/Classes/ViewHelpers/VideoPublicUrlViewHelper.php @@ -61,7 +61,7 @@ public static function renderStatic( $file = $fileReference->getOriginalFile(); $helper = self::getOnlineMediaHelper($file); if ($helper instanceof OnlineMediaHelperInterface) { - $publicUrl = $helper->getPublicUrl($file); + $publicUrl = $helper->getPublicUrl($file) ?? ''; } return $publicUrl; From c4bb0250ca56f07a56a26aba73c595bbfd24c3ba Mon Sep 17 00:00:00 2001 From: Hoja Mustaffa Abdul Latheef Date: Mon, 21 Oct 2024 09:25:04 +0200 Subject: [PATCH 2/5] [TASK] Added ignore path for .Build --- .gitignore | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ff89ea..5b6df42 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,16 @@ nbproject .sass-cache .session *.log + # Ignore composer stuff -/composer.lock +bin/* +vendor/* +.build +.Build +.php_cs.cache +composer.lock + +# Ignore testing stuff +/.Build +/composer.json.orig +/composer.json.testing From 1a9609d25170af5a08a393dcf5ff7b0f5c0789c0 Mon Sep 17 00:00:00 2001 From: Hoja Mustaffa Abdul Latheef Date: Mon, 21 Oct 2024 09:25:21 +0200 Subject: [PATCH 3/5] [TASK] Added ChangeLog --- Documentation/ChangeLog/Index.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/ChangeLog/Index.rst diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst new file mode 100644 index 0000000..986765a --- /dev/null +++ b/Documentation/ChangeLog/Index.rst @@ -0,0 +1,22 @@ +.. include:: /Includes.rst.txt + + +.. _changelog: + +========= +ChangeLog +========= + +Version 3.2.0 +============= + +* [BUGFIX] + +Version 3.1.0 +============= + +* [FEATURE] Add VH argument fallbackThumbnailFile +* [TASK] Remove TypoScript access from VH +* [BUGFIX] Prevent duplicate EXT: parsing +* [DOCS] Please read update instructions before updating. Maybe you have to update your templates!!! + From 3addce5eb2dabd7a0fa4aefc420be5aa678bb44e Mon Sep 17 00:00:00 2001 From: Hoja Mustaffa Abdul Latheef Date: Mon, 21 Oct 2024 09:26:05 +0200 Subject: [PATCH 4/5] [TASK] Updated Release notes in ChangeLog and updated version to 3.2.0 --- Documentation/Index.rst | 1 + Documentation/Settings.cfg | 4 ++-- composer.json | 9 +++++++-- ext_emconf.php | 8 ++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Documentation/Index.rst b/Documentation/Index.rst index d830b43..2c88b21 100644 --- a/Documentation/Index.rst +++ b/Documentation/Index.rst @@ -43,6 +43,7 @@ This extension provides more privacy when embedding videos in frontend. Installation/Index Configuration/Index Update/Index + ChangeLog/Index Links .. Meta Menu diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 1c7f620..bc6d69c 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -4,8 +4,8 @@ [general] project = Video Shariff -version = 3.1.0 -release = 3.1 +version = 3.2.0 +release = 3.2 copyright = by jweiland.net [html_theme_options] diff --git a/composer.json b/composer.json index 286bfa5..c2adbed 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,12 @@ { "name": "Stefan Froemken", "email": "projects@jweiland.net", - "role": "Developer" + "role": "Lead TYPO3 Developer" + }, + { + "name": "Hoja Mustaffa Abdul Latheef", + "email": "projects@jweiland.net", + "role": "Senior TYPO3 Developer" } ], "homepage": "https://jweiland.net", @@ -25,7 +30,7 @@ "source": "https://github.com/jweiland-net/video_shariff" }, "require": { - "typo3/cms-core": "^11.5.23 || ^12.3.0" + "typo3/cms-core": "^11.5.41 || ^12.4.22" }, "require-dev": { "ergebnis/composer-normalize": "~2.42.0", diff --git a/ext_emconf.php b/ext_emconf.php index f0a5a23..b437c2a 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -12,14 +12,14 @@ 'description' => 'This extension provides more privacy when embedding videos in frontend.', 'category' => 'plugin', 'state' => 'stable', - 'author' => 'Stefan Froemken', + 'author' => 'Stefan Froemken, Hoja Mustaffa Abdul Latheef', 'author_email' => 'projects@jweiland.net', 'author_company' => 'jweiland.net', - 'version' => '3.1.0', + 'version' => '3.2.0', 'constraints' => [ 'depends' => [ - 'typo3' => '11.5.23-12.4.99', - 'fluid_styled_content' => '11.5.23-0.0.0', + 'typo3' => '11.5.41-12.4.99', + 'fluid_styled_content' => '11.5.41-0.0.0', ], 'conflicts' => [], 'suggests' => [], From 48ee51f59935d2461ea8fe202854d91f90959cad Mon Sep 17 00:00:00 2001 From: Hoja Mustaffa Abdul Latheef Date: Mon, 21 Oct 2024 09:40:16 +0200 Subject: [PATCH 5/5] [TASK] Documentation ChangeLog updated --- Documentation/ChangeLog/Index.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst index 986765a..88b9fa3 100644 --- a/Documentation/ChangeLog/Index.rst +++ b/Documentation/ChangeLog/Index.rst @@ -10,7 +10,9 @@ ChangeLog Version 3.2.0 ============= -* [BUGFIX] +* [TASK] Fixed Broken badge url +* [TASK] Documentation ChangeLog page added +* [BUGFIX] Prevent TypeError when returning public Version 3.1.0 =============