Code style fixes

Author: discordier

src/MetaModels/Filter/Setting/AbstractRange.php

@@ -163,14 +163,19 @@ protected function prepareWidgetLabel($objAttribute)
             'GET: ' . $this->getParamName()
         );
 
-        if ($this->get('fromfield') && $this->get('tofield')) {
+        $fromField = $this->get('fromfield');
+        $toField   = $this->get('tofield');
+        if ($fromField && $toField) {
             $arrLabel[0] .= ' ' . $GLOBALS['TL_LANG']['metamodels_frontendfilter']['fromto'];
-        } elseif ($this->get('fromfield') && !$this->get('tofield')) {
+            return $arrLabel;
+        }
+        if ($fromField && !$toField) {
             $arrLabel[0] .= ' ' . $GLOBALS['TL_LANG']['metamodels_frontendfilter']['from'];
-        } else {
-            $arrLabel[0] .= ' ' . $GLOBALS['TL_LANG']['metamodels_frontendfilter']['to'];
+            return $arrLabel;
         }
 
+        $arrLabel[0] .= ' ' . $GLOBALS['TL_LANG']['metamodels_frontendfilter']['to'];
+
         return $arrLabel;
     }
 
@@ -195,7 +200,7 @@ protected function prepareWidgetOptions($arrIds, $objAttribute)
             $mixOption = strip_tags($mixOption);
             $mixOption = trim($mixOption);
 
-            if ($mixOption === '' || $mixOption === null) {
+            if ('' === $mixOption || null === $mixOption) {
                 unset($arrOptions[$mixKeyOption]);
             }
         }
@@ -229,13 +234,13 @@ protected function prepareWidgetParamAndFilterUrl($arrFilterUrl)
             if ($parameterValue && ($parameterValue[0] || $parameterValue[1])) {
                 $privateFilterUrl[$parameterName] = $parameterValue;
 
-                return array($privateFilterUrl, $parameterValue);
-            } else {
-                // No values given, clear the array.
-                $parameterValue = null;
-
                 return array($privateFilterUrl, $parameterValue);
             }
+
+            // No values given, clear the array.
+            $parameterValue = null;
+
+            return array($privateFilterUrl, $parameterValue);
         }
 
         return array($privateFilterUrl, $parameterValue);
@@ -265,7 +270,7 @@ protected function getFilterWidgetParameters(IAttribute $attribute, $currentValu
                 'size'      => ($this->get('fromfield') && $this->get('tofield') ? 2 : 1),
                 'urlparam'  => $this->getParamName(),
                 'template'  => $this->get('template'),
-                'colname'   => $attribute->getColname(),
+                'colname'   => $attribute->getColName(),
             ),
             // We need to implode to have it transported correctly in the frontend filter.
             'urlvalue'      => !empty($currentValue) ? implode('__', $currentValue) : ''
@@ -274,9 +279,6 @@ protected function getFilterWidgetParameters(IAttribute $attribute, $currentValu
 
     /**
      * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     public function getParameterFilterWidgets(
         $arrIds,

src/MetaModels/Filter/Setting/RangeDate.php

@@ -34,7 +34,7 @@ protected function formatValue($value)
         $date = \DateTime::createFromFormat($this->get('dateformat'), $value);
 
         // Check if we have a date, if not return a empty string.
-        if ($date === false) {
+        if (false === $date) {
             return '';
         }
 

src/MetaModels/Filter/Setting/RangeDateFilterSettingTypeFactory.php

@@ -34,7 +34,7 @@ public function __construct()
         $this
             ->setTypeName('rangedate')
             ->setTypeIcon('system/modules/metamodelsfilter_range/html/filter_range.png')
-            ->setTypeClass('MetaModels\Filter\Setting\RangeDate')
+            ->setTypeClass(RangeDate::class)
             ->allowAttributeTypes('numeric', 'decimal', 'timestamp');
     }
 }

src/MetaModels/Filter/Setting/RangeFilterSettingTypeFactory.php

@@ -34,7 +34,7 @@ public function __construct()
         $this
             ->setTypeName('range')
             ->setTypeIcon('system/modules/metamodelsfilter_range/html/filter_range.png')
-            ->setTypeClass('MetaModels\Filter\Setting\Range')
+            ->setTypeClass(Range::class)
             ->allowAttributeTypes('numeric', 'decimal');
     }
 }