Merge branch '14'

.editorconfig

@@ -0,0 +1,57 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# TS/JS-Files
+[*.{ts,js,vue}]
+indent_size = 4
+indent_style = tab
+
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.rst]
+indent_size = 4
+max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# NEON-Files
+[*.neon]
+indent_size = 2
+indent_style = tab
+
+# package.json
+[package.json]
+indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab

.gitattributes

@@ -0,0 +1,4 @@
+/.editorconfig export-ignore
+/.gitignore export-ignore
+/.gitattributes export-ignore
+/.php-cs-fixer.php export-ignore

.gitignore

@@ -1,3 +1,4 @@
 .idea
-vendor
-composer.lock
+/composer.lock
+/vendor/
+/public/

.php-cs-fixer.php

@@ -0,0 +1,10 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('Classes')
+    ->in('Configuration');
+
+$config = \TYPO3\CodingStandards\CsFixerConfig::create();
+return $config
+    ->setUsingCache(false)
+    ->setFinder($finder);

Classes/Resource/Rendering/VimeoRenderer.php

@@ -20,8 +20,8 @@
 
 class VimeoRenderer extends \TYPO3\CMS\Core\Resource\Rendering\VimeoRenderer
 {
-    const templateName = 'Vimeo';
-    const type = 'vimeo';
+    public const templateName = 'Vimeo';
+    public const type = 'vimeo';
 
     /**
      * @var ConfigurationManager
@@ -47,7 +47,6 @@ public function getPriority()
      * @param int|string $height
      * @param array $options
      * @param bool $usedPathsRelativeToCurrentScript
-     * @param array $variables
      * @return string
      */
     public function render(
@@ -72,12 +71,12 @@ public function render(
             'src' => $src,
             'type' => self::type,
             'isReference' => $file instanceof FileReference,
-            'attributes' => empty($attributes) ? '' : ' ' . $this->implodeAttributes($attributes)
+            'attributes' => empty($attributes) ? '' : ' ' . $this->implodeAttributes($attributes),
         ];
 
         // calculate the padding for the item
         if (!empty($file->getProperty('height')) && !empty($file->getProperty('width'))) {
-            $paddingTop = ($file->getProperty('height') / $file->getProperty('width')) * 100;
+            $paddingTop = ((int)$file->getProperty('height') / (int)$file->getProperty('width')) * 100;
             $variables['paddingTop'] = $paddingTop;
         }
 
@@ -87,7 +86,10 @@ public function render(
         $view->setTemplateRootPaths($extensionConfiguration['view']['templateRootPaths']);
         $view->setTemplate(self::templateName);
         $view->assignMultiple($variables);
-        $view->setRequest($GLOBALS['TYPO3_REQUEST']);
+
+        if (method_exists($view, 'setRequest')) {
+            $view->setRequest($GLOBALS['TYPO3_REQUEST']);
+        }
 
         return $view->render();
     }

Classes/Resource/Rendering/YouTubeRenderer.php

@@ -20,8 +20,8 @@
 
 class YouTubeRenderer extends \TYPO3\CMS\Core\Resource\Rendering\YouTubeRenderer
 {
-    const templateName = 'YouTube';
-    const type = 'youtube';
+    public const templateName = 'YouTube';
+    public const type = 'youtube';
 
     /**
      * @var ConfigurationManager
@@ -47,7 +47,6 @@ public function getPriority()
      * @param int|string $height
      * @param array $options
      * @param bool $usedPathsRelativeToCurrentScript
-     * @param array $variables
      * @return string
      */
     public function render(
@@ -72,12 +71,12 @@ public function render(
             'src' => $src,
             'type' => self::type,
             'isReference' => $file instanceof FileReference,
-            'attributes' => empty($attributes) ? '' : ' ' . $this->implodeAttributes($attributes)
+            'attributes' => empty($attributes) ? '' : ' ' . $this->implodeAttributes($attributes),
         ];
 
         // calculate the padding for the item
         if (!empty($file->getProperty('height')) && !empty($file->getProperty('width'))) {
-            $paddingTop = ($file->getProperty('height') / $file->getProperty('width')) * 100;
+            $paddingTop = ((int)$file->getProperty('height') / (int)$file->getProperty('width')) * 100;
             $variables['paddingTop'] = $paddingTop;
         }
 
@@ -87,7 +86,10 @@ public function render(
         $view->setTemplateRootPaths($extensionConfiguration['view']['templateRootPaths']);
         $view->setTemplate(self::templateName);
         $view->assignMultiple($variables);
-        $view->setRequest($GLOBALS['TYPO3_REQUEST']);
+
+        if (method_exists($view, 'setRequest')) {
+            $view->setRequest($GLOBALS['TYPO3_REQUEST']);
+        }
 
         return $view->render();
     }

composer.json

@@ -19,9 +19,19 @@
 		}
 	},
 	"require": {
-		"typo3/cms-core": "^10.4 || ^11.5 || ^12.4"
+		"typo3/cms-core": "^10.4 || ^11.5 || ^12.4",
+		"typo3/cms-fluid": "^10.4 || ^11.5 || ^12.4"
 	},
 	"require-dev": {
-		"typo3/tailor": "^1.3"
+		"typo3/tailor": "^1.3",
+		"typo3/coding-standards": "^0.7.1",
+		"phpstan/phpstan": "^1.10",
+		"saschaegerer/phpstan-typo3": "^1.9"
+	},
+	"config": {
+		"allow-plugins": {
+			"typo3/cms-composer-installers": true,
+			"typo3/class-alias-loader": true
+		}
 	}
 }

phpstan.neon

@@ -0,0 +1,17 @@
+includes:
+    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
+    - vendor/saschaegerer/phpstan-typo3/extension.neon
+
+parameters:
+  level: 5
+
+  paths:
+    - %currentWorkingDirectory%/
+
+  excludePaths:
+    analyseAndScan:
+      - */node_modules/*
+      - vendor/*
+      - public/*
+      - ./.php-cs-fixer.php
+      - ./ext_emconf.php