[TASK] Prepare release 4.0.1

This bugfix release contains Fixes in: * JavaScript registry * Glossary functionality * Glossary icon setup
web-vision · Jul 13, 2023 · b8dd42c · b8dd42c
1 parent 3b573c0
commit b8dd42c
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 28 deletions.
diff --git a/Build/phpstan/Core11/phpstan-baseline.neon b/Build/phpstan/Core11/phpstan-baseline.neon
@@ -50,6 +50,36 @@ parameters:
 			count: 1
 			path: ../../../Classes/Domain/Repository/GlossaryRepository.php
 
+		-
+			message: "#^Call to method getButtonBar\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Template\\\\Components\\\\ModifyButtonBarEvent\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
+		-
+			message: "#^Call to method getButtons\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Template\\\\Components\\\\ModifyButtonBarEvent\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
+		-
+			message: "#^Call to method getIdentifier\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Module\\\\ModuleInterface\\.$#"
+			count: 2
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
+		-
+			message: "#^Call to method setButtons\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Template\\\\Components\\\\ModifyButtonBarEvent\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
+		-
+			message: "#^Cannot call method getRequestUri\\(\\) on TYPO3\\\\CMS\\\\Core\\\\Http\\\\NormalizedParams\\|null\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
+		-
+			message: "#^Parameter \\$event of method WebVision\\\\WvDeepltranslate\\\\Event\\\\Listener\\\\GlossarySyncButtonProvider\\:\\:__invoke\\(\\) has invalid type TYPO3\\\\CMS\\\\Backend\\\\Template\\\\Components\\\\ModifyButtonBarEvent\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
 		-
 			message: "#^Method WebVision\\\\WvDeepltranslate\\\\Form\\\\Item\\\\SiteConfigSupportedLanguageItemsProcFunc\\:\\:getSupportedLanguageForField\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/Build/phpstan/Core12/phpstan-baseline.neon b/Build/phpstan/Core12/phpstan-baseline.neon
@@ -65,6 +65,11 @@ parameters:
 			count: 1
 			path: ../../../Classes/Domain/Repository/PageTreeRepository.php
 
+		-
+			message: "#^Cannot call method getRequestUri\\(\\) on TYPO3\\\\CMS\\\\Core\\\\Http\\\\NormalizedParams\\|null\\.$#"
+			count: 1
+			path: ../../../Classes/Event/Listener/GlossarySyncButtonProvider.php
+
 		-
 			message: "#^Method WebVision\\\\WvDeepltranslate\\\\Form\\\\Item\\\\SiteConfigSupportedLanguageItemsProcFunc\\:\\:getSupportedLanguageForField\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/Classes/Command/GlossaryListCommand.php b/Classes/Command/GlossaryListCommand.php
@@ -4,7 +4,6 @@
 
 namespace WebVision\WvDeepltranslate\Command;
 
-use DeepL\DeepLException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Classes/Domain/Repository/GlossaryRepository.php b/Classes/Domain/Repository/GlossaryRepository.php
@@ -4,7 +4,6 @@
 
 namespace WebVision\WvDeepltranslate\Domain\Repository;
 
-use DeepL\DeepLException;
 use DeepL\GlossaryInfo;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\Exception;

diff --git a/Classes/Event/Listener/GlossarySyncButtonProvider.php b/Classes/Event/Listener/GlossarySyncButtonProvider.php
@@ -5,6 +5,7 @@
 namespace WebVision\WvDeepltranslate\Event\Listener;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UriInterface;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\Template\Components\ModifyButtonBarEvent;
@@ -75,7 +76,7 @@ public function __invoke(ModifyButtonBarEvent $event): void
             'glossaryupdate',
             $parameters
         );
-        $button->setHref($uri);
+        $button->setHref((string)$uri);
 
         // Register Button and position it
         $buttons[ButtonBar::BUTTON_POSITION_LEFT][5][] = $button;
@@ -97,6 +98,10 @@ protected function getLanguageService(): LanguageService
     {
         return $GLOBALS['LANG'];
     }
+
+    /**
+     * @param array<int|string, mixed> $modTSconfig
+     */
     protected function isCreationAllowed(array $modTSconfig): bool
     {
         $allowedNewTables = GeneralUtility::trimExplode(',', $modTSconfig['allowedNewTables'] ?? '', true);
@@ -123,6 +128,9 @@ protected function canCreateNewRecord(int $id): bool
             || !$backendUser->workspaceCanCreateNewRecord(self::TABLE_NAME));
     }
 
+    /**
+     * @return array{uid: int, returnUrl: string|UriInterface}
+     */
     private function buildParamsArrayForListView(int $id): array
     {
         return [

diff --git a/Classes/Hooks/PageRendererHook.php b/Classes/Hooks/PageRendererHook.php
@@ -4,8 +4,9 @@
 
 namespace WebVision\WvDeepltranslate\Hooks;
 
-use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Page\PageRenderer;
+
 final class PageRendererHook
 {
     /**

diff --git a/Classes/Service/DeeplGlossaryService.php b/Classes/Service/DeeplGlossaryService.php
@@ -81,7 +81,6 @@ public function createGlossary(
      * Deletes a glossary
      *
      * @param string $glossaryId
-     *
      */
     public function deleteGlossary(string $glossaryId): void
     {
@@ -90,7 +89,6 @@ public function deleteGlossary(string $glossaryId): void
 
     /**
      * Gets information about a glossary
-     *
      */
     public function glossaryInformation(string $glossaryId): ?GlossaryInfo
     {
@@ -99,7 +97,6 @@ public function glossaryInformation(string $glossaryId): ?GlossaryInfo
 
     /**
      * Fetch glossary entries and format them as an associative array [source => target]
-     *
      */
     public function glossaryEntries(string $glossaryId): ?GlossaryEntries
     {

diff --git a/Classes/Service/DeeplService.php b/Classes/Service/DeeplService.php
@@ -7,7 +7,6 @@
 use DeepL\Language;
 use DeepL\TextResult;
 use Doctrine\DBAL\Driver\Exception;
-use Psr\Log\LoggerInterface;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Messaging\FlashMessage;

diff --git a/Configuration/Services.php b/Configuration/Services.php
@@ -116,7 +116,7 @@
                 'event.listener',
                 [
                     'identifier' => 'glossary.syncbutton',
-                    'event' => ModifyButtonBarEvent::class
+                    'event' => ModifyButtonBarEvent::class,
                 ]
             );
     }

diff --git a/Tests/Functional/ClientTest.php b/Tests/Functional/ClientTest.php
@@ -4,7 +4,6 @@
 
 namespace WebVision\WvDeepltranslate\Tests\Functional;
 
-use DeepL\DeepLException;
 use DeepL\GlossaryEntries;
 use DeepL\GlossaryInfo;
 use DeepL\GlossaryLanguagePair;
@@ -48,8 +47,8 @@ public function checkResponseFromTranslateContent(): void
             'DE'
         );
 
-        self::assertInstanceOf(TextResult::class, $response);
-        self::assertSame(self::EXAMPLE_TEXT['de'], $response->text);
+        static::assertInstanceOf(TextResult::class, $response);
+        static::assertSame(self::EXAMPLE_TEXT['de'], $response->text);
     }
 
     /**
@@ -60,8 +59,8 @@ public function checkResponseFromSupportedTargetLanguage(): void
         $client = $this->makeClient();
         $response = $client->getSupportedLanguageByType();
 
-        self::assertIsArray($response);
-        self::assertContainsOnlyInstancesOf(Language::class, $response);
+        static::assertIsArray($response);
+        static::assertContainsOnlyInstancesOf(Language::class, $response);
     }
 
     /**
@@ -72,8 +71,8 @@ public function checkResponseFromGlossaryLanguagePairs(): void
         $client = $this->makeClient();
         $response = $client->getGlossaryLanguagePairs();
 
-        self::assertIsArray($response);
-        self::assertContainsOnlyInstancesOf(GlossaryLanguagePair::class, $response);
+        static::assertIsArray($response);
+        static::assertContainsOnlyInstancesOf(GlossaryLanguagePair::class, $response);
     }
 
     /**
@@ -94,10 +93,10 @@ public function checkResponseFromCreateGlossary(): void
             ],
         );
 
-        self::assertInstanceOf(GlossaryInfo::class, $response);
-        self::assertSame(1, $response->entryCount);
-        self::assertIsString($response->glossaryId);
-        self::assertInstanceOf(\DateTime::class, $response->creationTime);
+        static::assertInstanceOf(GlossaryInfo::class, $response);
+        static::assertSame(1, $response->entryCount);
+        static::assertIsString($response->glossaryId);
+        static::assertInstanceOf(\DateTime::class, $response->creationTime);
     }
 
     /**
@@ -108,8 +107,8 @@ public function checkResponseGetAllGlossaries(): void
         $client = $this->makeClient();
         $response = $client->getAllGlossaries();
 
-        self::assertIsArray($response);
-        self::assertContainsOnlyInstancesOf(GlossaryInfo::class, $response);
+        static::assertIsArray($response);
+        static::assertContainsOnlyInstancesOf(GlossaryInfo::class, $response);
     }
 
     /**
@@ -132,9 +131,9 @@ public function checkResponseFromGetGlossary(): void
 
         $response = $client->getGlossary($glossary->glossaryId);
 
-        self::assertInstanceOf(GlossaryInfo::class, $response);
-        self::assertSame($glossary->glossaryId, $response->glossaryId);
-        self::assertSame(1, $response->entryCount);
+        static::assertInstanceOf(GlossaryInfo::class, $response);
+        static::assertSame($glossary->glossaryId, $response->glossaryId);
+        static::assertSame(1, $response->entryCount);
     }
 
     /**
@@ -159,7 +158,7 @@ public function checkGlossaryDeletedNotCatchable(): void
 
         $client->deleteGlossary($glossaryId);
 
-        self::assertNull($client->getGlossary($glossaryId));
+        static::assertNull($client->getGlossary($glossaryId));
     }
 
     /**
@@ -182,7 +181,7 @@ public function checkResponseFromGetGlossaryEntries(): void
 
         $response = $client->getGlossaryEntries($glossary->glossaryId);
 
-        self::assertInstanceOf(GlossaryEntries::class, $response);
-        self::assertSame(1, count($response->getEntries()));
+        static::assertInstanceOf(GlossaryEntries::class, $response);
+        static::assertSame(1, count($response->getEntries()));
     }
 }