Merge branch 'master' into typo3db

PHORAX · May 17, 2019 · 1bb5eb9 · 1bb5eb9
2 parents f676f4c + d465f21
commit 1bb5eb9
Show file tree

Hide file tree

Showing 63 changed files with 541 additions and 793 deletions.
diff --git a/Classes/Ajax/RemoveFile.php b/Classes/Ajax/RemoveFile.php
@@ -85,8 +85,6 @@ public function main()
 
     /**
      * Initialize the class. Read GET parameters
-     *
-     * @return void
      */
     protected function init()
     {
@@ -125,4 +123,4 @@ protected function init()
             $ajaxHandler->initAjax();
         }
     }
-}
+}
diff --git a/Classes/Ajax/Submit.php b/Classes/Ajax/Submit.php
@@ -54,8 +54,6 @@ public function main()
 
     /**
      * Initialize the class. Read GET parameters
-     *
-     * @return void
      */
     protected function init()
     {

diff --git a/Classes/Ajax/Validate.php b/Classes/Ajax/Validate.php
@@ -25,11 +25,10 @@ class Validate
     /**
      * @var array
      */
-    protected $templates = array(
+    protected $templates = [
         'spanSuccess' => '<span class="success">%s</span>',
         'spanError' => '<span class="error">%s</span>',
-    );
-
+    ];
 
     /**
      * Main method of the class.
@@ -87,8 +86,6 @@ public function main()
 
     /**
      * Initialize the class. Read GET parameters
-     *
-     * @return void
      */
     protected function init()
     {

diff --git a/Classes/AjaxHandler/AbstractAjaxHandler.php b/Classes/AjaxHandler/AbstractAjaxHandler.php
@@ -24,16 +24,13 @@ abstract class AbstractAjaxHandler extends \Typoheads\Formhandler\Component\Abst
 
     /**
      * Initialize AJAX stuff
-     *
-     * @return void
      */
     abstract public function initAjax();
 
     /**
      * Initialize the AjaxHandler
      *
      * @param array $settings The settings of the AjaxHandler
-     * @return void
      */
     public function init($settings)
     {
@@ -46,7 +43,6 @@ public function init($settings)
      * The view passes the marker array by reference.
      *
      * @param array &$markers Reference to the marker array
-     * @return void
      */
     abstract public function fillAjaxMarkers(&$markers);
 
@@ -56,7 +52,6 @@ abstract public function fillAjaxMarkers(&$markers);
      * @param string $text The link text to be used
      * @param string $field The field name of the form field
      * @param string $uploadedFileName The name of the file to be deleted
-     * @return void
      */
     abstract public function getFileRemovalLink($text, $field, $uploadedFileName);
 }
diff --git a/Classes/AjaxHandler/JQuery.php b/Classes/AjaxHandler/JQuery.php
@@ -24,24 +24,21 @@ class JQuery extends \Typoheads\Formhandler\AjaxHandler\AbstractAjaxHandler
     /**
      * @var array
      */
-    protected $templates = array(
+    protected $templates = [
         'spanLoading'=>'<span class="loading" id="loading_%s" style="display:none">%s</span>',
         'spanResult'=>'<span id="result_%s" class="formhandler-ajax-validation-result">%s</span>',
         'aRemoveLink'=>'<a class="formhandler_removelink" href="%s">%s</a>',
-    );
+    ];
 
     /**
      * Position of JS generated by AjaxHandler_JQuery (head|footer)
      *
-     * @access protected
      * @var string
      */
     protected $jsPosition;
 
     /**
      * Initialize AJAX stuff
-     *
-     * @return void
      */
     public function initAjax()
     {
@@ -108,7 +105,6 @@ public function initAjax()
      * The view passes the marker array by reference.
      *
      * @param array &$markers Reference to the marker array
-     * @return void
      */
     public function fillAjaxMarkers(&$markers)
     {
@@ -203,20 +199,20 @@ protected function getJavascriptFormInit($formSelector, $submitButtonSelector, $
     {
         return '(function( $ ) {
                     $(function() {
-                        $("'.$formSelector.'").formhandler({
-                            pageID: "'.$GLOBALS['TSFE']->id.'",
-                            contentID: "'.$this->cObj->data['uid'].'",
-                            randomID: "'.$this->globals->getRandomID().'",
-                            formValuesPrefix: "'.$this->globals->getFormValuesPrefix().'",
-                            lang: "'.$GLOBALS['TSFE']->sys_language_uid.'",
-                            submitButtonSelector: "'.$submitButtonSelector.'",
-                            ajaxSubmit: '.($isAjaxSubmit ? "true" : "false").',
-                            autoDisableSubmitButton: '.($autoDisableSubmitButton ? "true" : "false").',
-                            validateFields: [\''.implode("','", $validateFields).'\'],
+                        $("' . $formSelector . '").formhandler({
+                            pageID: "' . $GLOBALS['TSFE']->id . '",
+                            contentID: "' . $this->cObj->data['uid'] . '",
+                            randomID: "' . $this->globals->getRandomID() . '",
+                            formValuesPrefix: "' . $this->globals->getFormValuesPrefix() . '",
+                            lang: "' . $GLOBALS['TSFE']->sys_language_uid . '",
+                            submitButtonSelector: "' . $submitButtonSelector . '",
+                            ajaxSubmit: ' . ($isAjaxSubmit ? 'true' : 'false') . ',
+                            autoDisableSubmitButton: ' . ($autoDisableSubmitButton ? 'true' : 'false') . ',
+                            validateFields: [\'' . implode("','", $validateFields) . '\'],
                             validationStatusClasses: {
-                                base: "'.$this->validationStatusClasses['base'].'",
-                                valid: "'.$this->validationStatusClasses['valid'].'",
-                                invalid: "'.$this->validationStatusClasses['invalid'].'"
+                                base: "' . $this->validationStatusClasses['base'] . '",
+                                valid: "' . $this->validationStatusClasses['valid'] . '",
+                                invalid: "' . $this->validationStatusClasses['invalid'] . '"
                             }
                         });
                     });

diff --git a/Classes/Component/AbstractClass.php b/Classes/Component/AbstractClass.php
@@ -25,39 +25,34 @@ abstract class AbstractClass
     /**
      * The Formhandler component manager
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Component\Manager
      */
     protected $componentManager;
 
     /**
      * The global Formhandler configuration
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Controller\Configuration
      */
     protected $configuration;
 
     /**
      * The global Formhandler values
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\Globals
      */
     protected $globals;
 
     /**
      * The Formhandler utility methods
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\GeneralUtility
      */
     protected $utilityFuncs;
 
     /**
      * The cObj
      *
-     * @access protected
      * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
      */
     protected $cObj;
@@ -67,13 +62,12 @@ abstract class AbstractClass
      *
      * @param \Typoheads\Formhandler\Component\Manager $componentManager
      * @param \Typoheads\Formhandler\Controller\Configuration $configuration
-     * @return void
      */
     public function __construct(
         \Typoheads\Formhandler\Component\Manager $componentManager,
-                                \Typoheads\Formhandler\Controller\Configuration $configuration,
-                                \Typoheads\Formhandler\Utility\Globals $globals,
-                                \Typoheads\Formhandler\Utility\GeneralUtility $utilityFuncs
+        \Typoheads\Formhandler\Controller\Configuration $configuration,
+        \Typoheads\Formhandler\Utility\Globals $globals,
+        \Typoheads\Formhandler\Utility\GeneralUtility $utilityFuncs
     ) {
         $this->componentManager = $componentManager;
         $this->configuration = $configuration;

diff --git a/Classes/Component/AbstractComponent.php b/Classes/Component/AbstractComponent.php
@@ -25,15 +25,13 @@ abstract class AbstractComponent extends AbstractClass
     /**
      * The GET/POST parameters
      *
-     * @access protected
      * @var array
      */
     protected $gp;
 
     /**
      * Settings
      *
-     * @access protected
      * @var array
      */
     protected $settings;
@@ -43,8 +41,6 @@ abstract class AbstractComponent extends AbstractClass
      *
      * @param array $gp GET and POST variable array
      * @param array $settings Typoscript configuration for the component (component.1.config.*)
-     *
-     * @return void
      */
     public function init($gp, $settings)
     {

diff --git a/Classes/Component/Manager.php b/Classes/Component/Manager.php
@@ -29,15 +29,13 @@ class Manager implements SingletonInterface
     /**
      * The global Formhandler values
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\Globals
      */
     protected $globals;
 
     /**
      * The global Formhandler values
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\GeneralUtility
      */
     protected $utilityFuncs;

diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
@@ -25,31 +25,27 @@ abstract class AbstractController extends AbstractClass
     /**
      * The content returned by the controller
      *
-     * @access protected
      * @var Content
      */
     protected $content;
 
     /**
      * The key of a possibly selected predefined form
      *
-     * @access protected
      * @var string
      */
     protected $predefined;
 
     /**
      * The template file to be used. Only if template file was defined via plugin record
      *
-     * @access protected
      * @var string
      */
     protected $templateFile;
 
     /**
      * Array of configured translation files
      *
-     * @access protected
      * @var array
      */
     protected $langFiles;
@@ -58,7 +54,6 @@ abstract class AbstractController extends AbstractClass
      * Sets the content attribute of the controller
      *
      * @param Content $content
-     * @return void
      */
     public function setContent($content)
     {
@@ -79,7 +74,6 @@ public function getContent()
      * Sets the internal attribute "predefined"
      *
      * @param string $key
-     * @return void
      */
     public function setPredefined($key)
     {
@@ -90,7 +84,6 @@ public function setPredefined($key)
      * Sets the internal attribute "langFile"
      *
      * @param array $langFiles
-     * @return void
      */
     public function setLangFiles($langFiles)
     {
@@ -100,7 +93,6 @@ public function setLangFiles($langFiles)
     /**
      * Sets the template file attribute to $template
      * @param string $template
-     * @return void
      */
     public function setTemplateFile($template)
     {

diff --git a/Classes/Controller/Configuration.php b/Classes/Controller/Configuration.php
@@ -31,15 +31,12 @@ class Configuration implements \ArrayAccess
     /**
      * The TS setup
      *
-     * @access protected
      * @var array
      */
     protected $setup;
 
     /**
      * The constructor reading the TS setup into the according attribute
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -60,7 +57,6 @@ public function __construct()
      * Merges the values of $setup with plugin.[xxx].settings
      *
      * @param array $setup
-     * @return void
      */
     public function merge($setup)
     {

diff --git a/Classes/Controller/Content.php b/Classes/Controller/Content.php
@@ -23,15 +23,12 @@ class Content
     /**
      * The actual content
      *
-     * @access protected
      * @var string
      */
     protected $content;
 
     /**
      * The constructor settings the internal attribute "content"
-     *
-     * @return void
      */
     public function __construct($content)
     {
@@ -42,7 +39,6 @@ public function __construct($content)
      * Sets the internal attribute "content"
      *
      * @param string $content
-     * @return void
      */
     public function setContent($content)
     {

diff --git a/Classes/Controller/Dispatcher.php b/Classes/Controller/Dispatcher.php
@@ -24,23 +24,20 @@ class Dispatcher extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
     /**
      * Compontent Manager
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Component\Manager
      */
     protected $componentManager;
 
     /**
      * The global Formhandler values
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\Globals
      */
     protected $globals;
 
     /**
      * The Formhandler utility functions
      *
-     * @access protected
      * @var \Typoheads\Formhandler\Utility\GeneralUtility
      */
     protected $utilityFuncs;
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,8 +54,6 @@ public function main() @@
         /**
          * Initialize the class. Read GET parameters
-         *
-         * @return void
          */
         protected function init()
         {
@@ Expand Down @@