[TASK] Fix CGL issues on "else if" constructs
authorOliver Hader <oliver@typo3.org>
Thu, 13 Oct 2011 16:21:51 +0000 (18:21 +0200)
committerOliver Hader <oliver@typo3.org>
Thu, 13 Oct 2011 16:22:53 +0000 (18:22 +0200)
Change-Id: I62d0f2e9a618a99b0b5469afd84beb936f71eceb

typo3/sysext/extbase/Classes/Service/FlexFormService.php
typo3/sysext/extbase/Classes/Utility/Arrays.php

index 80704ea..eb91f3e 100644 (file)
@@ -112,7 +112,7 @@ class Tx_Extbase_Service_FlexFormService implements t3lib_Singleton {
 
                                        $newNode = array(next($nodeKeyParts) => $nodeValue);
                                        $currentNode = $this->walkFlexFormNode($newNode, $valuePointer);
 
                                        $newNode = array(next($nodeKeyParts) => $nodeValue);
                                        $currentNode = $this->walkFlexFormNode($newNode, $valuePointer);
-                               } else if (is_array($nodeValue)) {
+                               } elseif (is_array($nodeValue)) {
                                        if (array_key_exists($valuePointer, $nodeValue)) {
                                                $return[$nodeKey] = $nodeValue[$valuePointer];
                                        } else {
                                        if (array_key_exists($valuePointer, $nodeValue)) {
                                                $return[$nodeKey] = $nodeValue[$valuePointer];
                                        } else {
index 9ec2e76..8131a35 100644 (file)
@@ -143,7 +143,7 @@ class Tx_Extbase_Utility_Arrays {
                        foreach ($array as $key => $value) {
                                if (!isset($previousType)) {
                                        $previousType = gettype($value);
                        foreach ($array as $key => $value) {
                                if (!isset($previousType)) {
                                        $previousType = gettype($value);
-                               } else if ($previousType !== gettype($value)) {
+                               } elseif ($previousType !== gettype($value)) {
                                        return TRUE;
                                }
                        }
                                        return TRUE;
                                }
                        }