[TASK] Fix TYPO3 coding standards issues after upgrade to v0.5.5

dkd-kaehm · dkd-kaehm · commit cd010f3f0fdd · 2022-09-22T17:45:09.000+02:00
See: https://github.com/TYPO3/coding-standards/releases/tag/v0.5.5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
         name: Mount RAMFS
         run: |
           sudo mkdir -p ${{ env.CI_BUILD_DIRECTORY }}
-          sudo mount -t tmpfs -o size=2048m none ${{ env.CI_BUILD_DIRECTORY }}
+          sudo mount -t tmpfs -o size=2560m none ${{ env.CI_BUILD_DIRECTORY }}
             sudo mkdir -p ${{ env.CI_BUILD_DIRECTORY }}/data-{solr,mysql,tika-binaries} \
             && sudo chown $USER ${{ env.CI_BUILD_DIRECTORY }}/data-{mysql,tika-binaries} \
             && sudo chown 8983:8983 ${{ env.CI_BUILD_DIRECTORY }}/data-solr
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+*.cache
 .Build
 .DS_Store
 /.buildpath
diff --git a/Classes/Controller/Backend/PreviewController.php b/Classes/Controller/Backend/PreviewController.php
@@ -37,7 +37,6 @@
  */
 class PreviewController
 {
-
     /**
      * @param ServerRequestInterface $request
      * @return string|Response
diff --git a/Classes/Controller/Backend/SolrModule/TikaControlPanelModuleController.php b/Classes/Controller/Backend/SolrModule/TikaControlPanelModuleController.php
@@ -40,7 +40,6 @@
  */
 class TikaControlPanelModuleController extends AbstractModuleController
 {
-
     /**
      * Tika configuration
      *
diff --git a/Classes/Process.php b/Classes/Process.php
@@ -23,7 +23,6 @@
  */
 class Process
 {
-
     /**
      * Process ID
      *
diff --git a/Classes/Service/Extractor/TextExtractor.php b/Classes/Service/Extractor/TextExtractor.php
@@ -34,7 +34,6 @@
  */
 class TextExtractor implements TextExtractorInterface
 {
-
     /**
      * @var array
      */
diff --git a/Classes/Service/File/SizeValidator.php b/Classes/Service/File/SizeValidator.php
@@ -27,7 +27,6 @@
  */
 class SizeValidator
 {
-
     /**
      * @var array
      */
diff --git a/Classes/Service/Tika/AbstractService.php b/Classes/Service/Tika/AbstractService.php
@@ -103,7 +103,7 @@ protected function getAdditionalCommandOptions(): string
 
         // Early return if no additional command options are configured
         // or configuration does not match required pattern (only -D parameter is supported)
-        if ('' === $commandOptions || !preg_match_all(self::JAVA_COMMAND_OPTIONS_REGEX, $commandOptions, $matches)) {
+        if ($commandOptions === '' || !preg_match_all(self::JAVA_COMMAND_OPTIONS_REGEX, $commandOptions, $matches)) {
             return '';
         }
 
diff --git a/Classes/Service/Tika/ServerService.php b/Classes/Service/Tika/ServerService.php
@@ -141,7 +141,7 @@ public function startServer(): void
     public function stopServer(): void
     {
         $pid = $this->getServerPid();
-        if (null === $pid) {
+        if ($pid === null) {
             return;
         }
 
diff --git a/Classes/Service/Tika/ServiceFactory.php b/Classes/Service/Tika/ServiceFactory.php
@@ -30,7 +30,6 @@
  */
 class ServiceFactory
 {
-
     /**
      * Creates an instance of a Tika service
      *
diff --git a/Classes/ViewHelpers/Backend/IsStringViewHelper.php b/Classes/ViewHelpers/Backend/IsStringViewHelper.php
@@ -26,7 +26,6 @@
  */
 class IsStringViewHelper extends AbstractConditionViewHelper
 {
-
     /**
      * Initialize ViewHelper arguments
      *
diff --git a/Tests/Integration/Service/Tika/Fixtures/ServerServiceFixture.php b/Tests/Integration/Service/Tika/Fixtures/ServerServiceFixture.php
@@ -28,7 +28,6 @@
  */
 class ServerServiceFixture extends ServerService
 {
-
     /**
      * The endpoint to be used
      *
diff --git a/Tests/Unit/ExecRecorder.php b/Tests/Unit/ExecRecorder.php
@@ -34,7 +34,6 @@
  */
 class ExecRecorder
 {
-
     /**
      * Allows to capture exec() parameters
      *
diff --git a/Tests/Unit/ProcessTest.php b/Tests/Unit/ProcessTest.php
@@ -26,7 +26,6 @@
  */
 class ProcessTest extends UnitTestCase
 {
-
     /**
      * @test
      */
diff --git a/Tests/Unit/Service/Extractor/MetaDataExtractorTest.php b/Tests/Unit/Service/Extractor/MetaDataExtractorTest.php
@@ -30,7 +30,6 @@
  */
 class MetaDataExtractorTest extends UnitTestCase
 {
-
     /**
      * Returns a faked extractor response of a jpeg image.
      *
diff --git a/Tests/Unit/Service/Tika/AbstractServiceTest.php b/Tests/Unit/Service/Tika/AbstractServiceTest.php
@@ -28,7 +28,6 @@
  */
 class AbstractServiceTest extends UnitTestCase
 {
-
     /**
      * @test
      */
diff --git a/Tests/Unit/UnitTestCase.php b/Tests/Unit/UnitTestCase.php
@@ -59,7 +59,7 @@ protected function getFixturePath(string $fixtureName): string
      */
     protected function getRuntimeDirectory(): string
     {
-        $rc = new ReflectionClass(get_class($this));
+        $rc = new ReflectionClass(static::class);
         return dirname($rc->getFileName());
     }
 }
diff --git a/ext_tables.php b/ext_tables.php
@@ -18,11 +18,11 @@
 /* @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */ // register all module icons with extensions-solr-module-modulename
 $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
 
-    $iconRegistry->registerIcon(
-        $modulePrefix . '-tikacontrolpanel',
-        $svgProvider,
-        ['source' => $extIconPath . 'module-tika.svg']
-    );
+$iconRegistry->registerIcon(
+    $modulePrefix . '-tikacontrolpanel',
+    $svgProvider,
+    ['source' => $extIconPath . 'module-tika.svg']
+);
 
 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('solr')) {
     $tikaExtensionConfiguration = \ApacheSolrForTypo3\Tika\Util::getTikaExtensionConfiguration();

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+*.cache`
`1`	`2`	`.Build`
`2`	`3`	`.DS_Store`
`3`	`4`	`/.buildpath`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@`
`37`	`37`	`*/`
`38`	`38`	`class PreviewController`
`39`	`39`	`{`
`40`		`-`
`41`	`40`	`/**`
`42`	`41`	`* @param ServerRequestInterface $request`
`43`	`42`	`* @return string\|Response`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`*/`
`41`	`41`	`class TikaControlPanelModuleController extends AbstractModuleController`
`42`	`42`	`{`
`43`		`-`
`44`	`43`	`/**`
`45`	`44`	`* Tika configuration`
`46`	`45`	`*`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`*/`
`24`	`24`	`class Process`
`25`	`25`	`{`
`26`		`-`
`27`	`26`	`/**`
`28`	`27`	`* Process ID`
`29`	`28`	`*`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@`
`34`	`34`	`*/`
`35`	`35`	`class TextExtractor implements TextExtractorInterface`
`36`	`36`	`{`
`37`		`-`
`38`	`37`	`/**`
`39`	`38`	`* @var array`
`40`	`39`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`*/`
`28`	`28`	`class SizeValidator`
`29`	`29`	`{`
`30`		`-`
`31`	`30`	`/**`
`32`	`31`	`* @var array`
`33`	`32`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function getAdditionalCommandOptions(): string`
`103`	`103`
`104`	`104`	`// Early return if no additional command options are configured`
`105`	`105`	`// or configuration does not match required pattern (only -D parameter is supported)`
`106`		`- if ('' === $commandOptions \|\| !preg_match_all(self::JAVA_COMMAND_OPTIONS_REGEX, $commandOptions, $matches)) {`
	`106`	`+ if ($commandOptions === '' \|\| !preg_match_all(self::JAVA_COMMAND_OPTIONS_REGEX, $commandOptions, $matches)) {`
`107`	`107`	`return '';`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function startServer(): void`
`141`	`141`	`public function stopServer(): void`
`142`	`142`	`{`
`143`	`143`	`$pid = $this->getServerPid();`
`144`		`- if (null === $pid) {`
	`144`	`+ if ($pid === null) {`
`145`	`145`	`return;`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`*/`
`31`	`31`	`class ServiceFactory`
`32`	`32`	`{`
`33`		`-`
`34`	`33`	`/**`
`35`	`34`	`* Creates an instance of a Tika service`
`36`	`35`	`*`