[2.3] Static Code Analysis for Components

Author: kalessil

Extension/Core/DataTransformer/BaseDateTimeTransformer.php

@@ -40,11 +40,11 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface
      */
     public function __construct($inputTimezone = null, $outputTimezone = null)
     {
-        if (!is_string($inputTimezone) && null !== $inputTimezone) {
+        if (null !== $inputTimezone && !is_string($inputTimezone)) {
             throw new UnexpectedTypeException($inputTimezone, 'string');
         }
 
-        if (!is_string($outputTimezone) && null !== $outputTimezone) {
+        if (null !== $outputTimezone && !is_string($outputTimezone)) {
             throw new UnexpectedTypeException($outputTimezone, 'string');
         }
 

Extension/Core/DataTransformer/DateTimeToArrayTransformer.php

@@ -99,6 +99,8 @@ public function transform($dateTime)
                 // remove leading zeros
                 $entry = (string) (int) $entry;
             }
+            // unset reference to keep scope clear
+            unset($entry);
         }
 
         return $result;

Extension/Core/EventListener/MergeCollectionListener.php

@@ -74,7 +74,7 @@ public function onSubmit(FormEvent $event)
         }
 
         // If we are not allowed to change anything, return immediately
-        if ((!$this->allowAdd && !$this->allowDelete) || $data === $dataToMergeInto) {
+        if ($data === $dataToMergeInto || (!$this->allowAdd && !$this->allowDelete)) {
             $event->setData($dataToMergeInto);
 
             return;