Adding PSR12 coding standard

.gitignore

@@ -0,0 +1 @@
+.idea/

.php_cs.dist

@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * This file represents the configuration for Code Sniffing PSR-2-related
  * automatic checks of coding guidelines
@@ -23,39 +24,54 @@ if (PHP_SAPI !== 'cli') {
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules([
+        '@DoctrineAnnotation' => true,
         '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'cast_spaces' => ['space' => 'none'],
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'none'],
+        'dir_constant' => true,
+        'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => [
             'author'
         ],
+        'hash_to_slash_comment' => true,
+        'lowercase_cast' => true,
+        'modernize_types_casting' => true,
+        'native_function_casing' => true,
+        'no_alias_functions' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => true,
         'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_null_property_initialization' => true,
+        'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_superfluous_elseif' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unneeded_control_parentheses' => true,
         'no_unused_imports' => true,
-        'concat_space' => ['spacing' => 'one'],
+        'no_useless_else' => true,
         'no_whitespace_in_blank_line' => true,
         'ordered_imports' => true,
-        'single_quote' => true,
-        'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
+        'phpdoc_no_access' => true,
+        'phpdoc_no_empty_return' => true,
         'phpdoc_no_package' => true,
         'phpdoc_scalar' => true,
-        'no_blank_lines_after_phpdoc' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'whitespace_after_comma_in_array' => true,
-        'function_typehint_space' => true,
-        'hash_to_slash_comment' => true,
-        'no_alias_functions' => true,
-        'lowercase_cast' => true,
-        'no_leading_namespace_whitespace' => true,
-        'native_function_casing' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'return_type_declaration' => ['space_before' => 'none'],
         'self_accessor' => true,
-        'no_short_bool_cast' => true,
-        'no_unneeded_control_parentheses' => true
+        'single_quote' => true,
+        'whitespace_after_comma_in_array' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('.build')
             ->exclude('var')
             ->exclude('public')
             ->in(__DIR__)
-    );
+    );

Classes/ContentObject/JsonContentObject.php

@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-namespace FriendsOfTYPO3\Headless\ContentObject;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\Headless\ContentObject;
+
 use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -166,7 +167,7 @@ protected function recursiveFind(array $haystack, $needle)
      * @param array $data
      * @return array
      */
-    protected function decodeFieldsIfRequired(array $data) : array
+    protected function decodeFieldsIfRequired(array $data): array
     {
         $json = [];
 

Classes/DataProcessing/FilesProcessor.php

@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-namespace FriendsOfTYPO3\Headless\DataProcessing;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\Headless\DataProcessing;
+
 use FriendsOfTYPO3\Headless\Utility\FileUtility;
 use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;

Classes/DataProcessing/GalleryProcessor.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FriendsOfTYPO3\Headless\DataProcessing;

Classes/DataProcessing/MenuProcessor.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FriendsOfTYPO3\Headless\DataProcessing;

Classes/Hooks/TypolinkHook.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace FriendsOfTYPO3\Headless\Hooks;
 

Classes/Resource/Rendering/VimeoRenderer.php

@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-namespace FriendsOfTYPO3\Headless\Resource\Rendering;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\Headless\Resource\Rendering;
+
 use TYPO3\CMS\Core\Resource\FileInterface;
 
 /**
@@ -39,13 +40,12 @@ public function getPriority(): int
      * @param bool $usedPathsRelativeToCurrentScript See $file->getPublicUrl()
      * @return string
      */
-    public function render(FileInterface $file, $width, $height, array $options = [], $usedPathsRelativeToCurrentScript = false)
+    public function render(FileInterface $file, $width, $height, array $options = [], $usedPathsRelativeToCurrentScript = false): string
     {
         if ($options['returnUrl'] === true) {
             $src = $this->createVimeoUrl($options, $file);
             return htmlspecialchars($src, ENT_QUOTES | ENT_HTML5);
-        } else {
-            return parent::render(...func_get_args());
         }
+        return parent::render(...func_get_args());
     }
 }

Classes/Resource/Rendering/YouTubeRenderer.php

@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-namespace FriendsOfTYPO3\Headless\Resource\Rendering;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\Headless\Resource\Rendering;
+
 use TYPO3\CMS\Core\Resource\FileInterface;
 
 /**
@@ -44,8 +45,7 @@ public function render(FileInterface $file, $width, $height, array $options = []
         if ($options['returnUrl'] === true) {
             $src = $this->createYouTubeUrl($options, $file);
             return htmlspecialchars($src, ENT_QUOTES | ENT_HTML5);
-        } else {
-            return parent::render(...func_get_args());
         }
+        return parent::render(...func_get_args());
     }
 }

Classes/Service/PaginationService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FriendsOfTYPO3\Headless\Service;
@@ -104,7 +105,7 @@ public function __construct(QueryResultInterface $objects, int $itemsPerPage = 1
     public function paginate(int $currentPage = 1): array
     {
         // set current page
-        $this->currentPage = (integer)$currentPage;
+        $this->currentPage = (int)$currentPage;
         if ($this->currentPage < 1) {
             $this->currentPage = 1;
         }
@@ -114,11 +115,11 @@ public function paginate(int $currentPage = 1): array
             $modifiedObjects = null;
         } else {
             // modify query
-            $itemsPerPage = (integer)$this->configuration['itemsPerPage'];
+            $itemsPerPage = (int)$this->configuration['itemsPerPage'];
             $query = $this->objects->getQuery();
 
             if ($this->currentPage === $this->numberOfPages && $this->initialLimit > 0) {
-                $difference = $this->initialLimit - ((integer)($itemsPerPage * ($this->currentPage - 1)));
+                $difference = $this->initialLimit - ((int)($itemsPerPage * ($this->currentPage - 1)));
                 if ($difference > 0) {
                     $query->setLimit($difference);
                 } else {
@@ -129,7 +130,7 @@ public function paginate(int $currentPage = 1): array
             }
 
             if ($this->currentPage > 1) {
-                $offset = (integer)($itemsPerPage * ($this->currentPage - 1));
+                $offset = (int)($itemsPerPage * ($this->currentPage - 1));
                 $offset += $this->initialOffset;
                 $query->setOffset($offset);
             } elseif ($this->initialOffset > 0) {
@@ -198,8 +199,8 @@ protected function calculateDisplayRange(): void
         if ($this->displayRangeEnd > $this->numberOfPages) {
             $this->displayRangeStart -= $this->displayRangeEnd - $this->numberOfPages;
         }
-        $this->displayRangeStart = (integer)max($this->displayRangeStart, 1);
-        $this->displayRangeEnd = (integer)min($this->displayRangeEnd, $this->numberOfPages);
+        $this->displayRangeStart = (int)max($this->displayRangeStart, 1);
+        $this->displayRangeEnd = (int)min($this->displayRangeEnd, $this->numberOfPages);
     }
 
     /**

Classes/Utility/ContentUtility.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace FriendsOfTYPO3\Headless\Utility;
 

Classes/Utility/FileUtility.php

@@ -1,7 +1,4 @@
 <?php
-declare(strict_types = 1);
-
-namespace FriendsOfTYPO3\Headless\Utility;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+declare(strict_types=1);
+
+namespace FriendsOfTYPO3\Headless\Utility;
+
 use TYPO3\CMS\Core\Http\NormalizedParams;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
 use TYPO3\CMS\Core\Resource\AbstractFile;

Classes/ViewHelpers/Format/Json/DecodeViewHelper.php

@@ -1,5 +1,4 @@
 <?php
-namespace FriendsOfTYPO3\Headless\ViewHelpers\Format\Json;
 
 /***
  *
@@ -12,6 +11,8 @@
  *
  ***/
 
+namespace FriendsOfTYPO3\Headless\ViewHelpers\Format\Json;
+
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**

Classes/ViewHelpers/Iterator/ExplodeViewHelper.php

@@ -1,7 +1,4 @@
 <?php
-namespace FriendsOfTYPO3\Headless\ViewHelpers\Iterator;
-
-use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /***
  *
@@ -14,6 +11,10 @@
  *
  ***/
 
+namespace FriendsOfTYPO3\Headless\ViewHelpers\Iterator;
+
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+
 /**
  * Explode ViewHelper
  * Explodes a string by $glue

Configuration/TypoScript/Helper/Page.typoscript

@@ -259,4 +259,4 @@ lib.page {
             }
         }
     }
-}
+}