[TASK] Add phpstan

# Conflicts:
#	composer.json

Author: sabbelasichon

Classes/Ajax/RemoveFile.php

@@ -22,16 +22,54 @@
  */
 class RemoveFile
 {
+    /**
+     * @var string
+     */
+    private $fieldName;
+
+    /**
+     * @var string
+     */
+    private $uploadedFileName;
+
+    /**
+     * @var Manager
+     */
+    private $componentManager;
+
+    /**
+     * @var Globals
+     */
+    private $globals;
+
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @var \Typoheads\Formhandler\Utility\GeneralUtility
+     */
+    private $utilityFuncs;
+
+    /**
+     * @var array
+     */
+    private $settings;
+
+    /**
+     * @var array
+     */
+    private $langFiles;
 
     /**
      * Main method of the class.
-     *
-     * @return string The HTML list of remaining files to be displayed in the form
      */
     public function main()
     {
         $this->init();
         $content = '';
+        $field = null;
 
         if ($this->fieldName) {
             $sessionFiles = $this->globals->getSession()->get('files');
@@ -72,7 +110,7 @@ public function main()
             $this->globals->getSession()->set('files', $sessionFiles);
 
             // Add the content to or Result Box: #formResult
-            if (is_array($sessionFiles) && !empty($sessionFiles[$field])) {
+            if ($field !== null && is_array($sessionFiles) && !empty($sessionFiles[$field])) {
                 $markers = [];
                 $view = $this->componentManager->getComponent('View\\Form');
                 $view->setSettings($this->settings);

Classes/Ajax/Validate.php

@@ -1,6 +1,7 @@
 <?php
 namespace Typoheads\Formhandler\Ajax;
 
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use Typoheads\Formhandler\Utility\Globals;
 use Typoheads\Formhandler\Component\Manager;
 /*                                                                        *
@@ -18,6 +19,7 @@
 *                                                                        */
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
+use Typoheads\Formhandler\View\AjaxValidation;
 
 /**
  * A class validating a field via AJAX.
@@ -33,6 +35,22 @@ class Validate
         'spanError' => '<span class="error">%s</span>',
     ];
 
+    /**
+     * @var Manager
+     */
+    private $componentManager;
+
+    /**
+     * @var array
+     */
+    private $settings;
+
+
+    /**
+     * @var int
+     */
+    private $id;
+
     /**
      * Main method of the class.
      *
@@ -106,7 +124,7 @@ protected function init()
      * Initialize the AJAX validation view.
      *
      * @param string $content The raw content
-     * @return Tx_Formhandler_View_AjaxValidation The view class
+     * @return AjaxValidation The view class
      */
     protected function initView($content)
     {

Classes/AjaxHandler/JQuery.php

@@ -1,6 +1,7 @@
 <?php
 namespace Typoheads\Formhandler\AjaxHandler;
 
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Context\Context;
 /*                                                                       *

Classes/Component/AbstractClass.php

@@ -59,6 +59,16 @@ abstract class AbstractClass
      */
     protected $cObj;
 
+    /**
+     * @var array
+     */
+    protected $settings;
+
+    /**
+     * @var array
+     */
+    protected $validationStatusClasses;
+
     /**
      * The constructor for an interceptor setting the component manager and the configuration.
      *

Classes/Controller/Configuration.php

@@ -1,6 +1,7 @@
 <?php
 namespace Typoheads\Formhandler\Controller;
 
+use TYPO3\CMS\Core\Http\ApplicationType;
 use Typoheads\Formhandler\Utility\Globals;
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
@@ -36,12 +37,22 @@ class Configuration implements \ArrayAccess
      */
     protected $setup;
 
+    /**
+     * @var Globals
+     */
+    private $globals;
+
+    /**
+     * @var \Typoheads\Formhandler\Utility\GeneralUtility
+     */
+    private $utilityFuncs;
+
     /**
      * The constructor reading the TS setup into the according attribute
      */
     public function __construct()
     {
-        if (TYPO3_MODE === 'FE') {
+        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
             $this->globals = GeneralUtility::makeInstance(Globals::class);
             $this->utilityFuncs = GeneralUtility::makeInstance(\Typoheads\Formhandler\Utility\GeneralUtility::class);
             $this->setup = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->getPrefixedPackageKey() . '.'];
@@ -57,7 +68,7 @@ public function __construct()
     /**
      * Merges the values of $setup with plugin.[xxx].settings
      *
-     * @param array $setup
+     * @param array|null $setup
      */
     public function merge($setup)
     {

Classes/Controller/Dispatcher.php

@@ -1,6 +1,7 @@
 <?php
 namespace Typoheads\Formhandler\Controller;
 
+use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Frontend\Plugin\AbstractPlugin;
 use Typoheads\Formhandler\Component\Manager;
 use Typoheads\Formhandler\Utility\Globals;
@@ -49,12 +50,11 @@ class Dispatcher extends AbstractPlugin
      * Main method of the dispatcher. This method is called as a user function.
      *
      * @return string rendered view
-     * @param string $content
+     * @param string|null $content
      * @param array $setup The TypoScript config
      */
     public function main($content, $setup)
     {
-        $this->pi_USER_INT_obj = 1;
         $this->componentManager = GeneralUtility::makeInstance(Manager::class);
         $this->globals = GeneralUtility::makeInstance(Globals::class);
         $this->utilityFuncs = GeneralUtility::makeInstance(\Typoheads\Formhandler\Utility\GeneralUtility::class);
@@ -113,11 +113,11 @@ public function main($content, $setup)
 
             $result = $controller->process();
         } catch (\Exception $e) {
-            GeneralUtility::sysLog(
+            GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__)->error(
                 $e->getFile() . '(' . $e->getLine() . ')' . ' ' . $e->getMessage(),
-                'formhandler',
-                GeneralUtility::SYSLOG_SEVERITY_ERROR
+                ['formhandler']
             );
+
             $result = $this->utilityFuncs->getTranslatedMessage($this->globals->getLangFiles(), 'fe-exception');
             if (!$result) {
                 $result = '<div style="color:red; font-weight: bold">' . $this->utilityFuncs->getExceptionMessage('fe-exception') . '</div>';

composer.json

@@ -7,10 +7,10 @@
     "require": {
         "typo3/cms-core": "^10.4.0",
         "tecnickcom/tcpdf": "^6.0",
-        "parsecsv/php-parsecsv": "^0.4",
         "typo3/cms-extbase": "^10.4.0",
         "typo3/cms-fluid": "^10.4.0",
-        "typo3/cms-frontend": "^10.4.0"
+        "typo3/cms-frontend": "^10.4.0",
+        "parsecsv/php-parsecsv": "^1.2"
     },
     "autoload": {
         "psr-4": {

dynamicReturnTypeMeta.json

@@ -0,0 +1,16 @@
+{
+  "methodCalls": [
+    {
+      "class": "\\TYPO3\\CMS\\Core\\Utility\\GeneralUtility",
+      "method": "makeInstance",
+      "position": 0
+    },
+    {
+      "class": "\\TYPO3\\CMS\\Extbase\\Object\\ObjectManagerInterface",
+      "method": "get",
+      "position": 0
+    }
+  ],
+  "functionCalls": [
+  ]
+}

ext_emconf.php

@@ -1,6 +1,6 @@
 <?php
 
-$EM_CONF[$_EXTKEY] = [
+$EM_CONF['formhandler'] = [
   'title' => 'Formhandler',
   'description' => 'The swiss army knife for all kinds of mailforms, completely new written using the MVC concept. Result: Flexibility, Flexibility, Flexibility  :-).',
   'category' => 'plugin',

ext_localconf.php

@@ -31,3 +31,11 @@
     \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
     ['source' => 'EXT:formhandler/Resources/Public/Images/pagetreeicon.png']
 );
+
+if (!isset($GLOBALS['TYPO3_CONF_VARS']['LOG']['Typoheads']['Formhandler']['writerConfiguration'])) {
+    $GLOBALS['TYPO3_CONF_VARS']['LOG']['Typoheads']['Formhandler']['writerConfiguration'] = [
+        \TYPO3\CMS\Core\Log\LogLevel::ERROR => [
+            \TYPO3\CMS\Core\Log\Writer\SyslogWriter::class => []
+        ],
+    ];
+}