[~TASK] Extbase (Utility): Changed Tx_Extbase_Utility_TypoScript:convertPlainArrayToT...
[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Classes / Utility / TypoScript.php
index 7bc665f..0224b56 100644 (file)
  * @package Extbase
  * @subpackage Utility
  * @version $ID:$
+ * @api
  */
 class Tx_Extbase_Utility_TypoScript {
 
        /**
         * Removes all trailing dots recursively from TS settings array
-        * TODO Explain why we remove the dots.
         *
-        * @param array $setup The settings array
+        * Extbase converts the "classical" TypoScript (with trailing dot) to a format without trailing dot,
+        * to be more future-proof and not to have any conflicts with Fluid object accessor syntax.
+        *
+        * @param array $settings The settings array
         * @return void
         * @api
         */
-       public static function convertTypoScriptArrayToPlainArray(array $settings) {
-               $processedSettings = array();
-               // TODO Check if the t3lib_div::removeDotsFromTS() fits for this purpose (using rtrim() for removing trailing dots)
-               foreach ($settings as $key => $value) {
-                       if (substr($key, -1) === '.') {
+       static public function convertTypoScriptArrayToPlainArray(array $settings) {
+               foreach ($settings as $key => &$value) {
+                       if(substr($key, -1) === '.') {
                                $keyWithoutDot = substr($key, 0, -1);
-                               if (is_array($value)) {
-                                       $processedSettings[$keyWithoutDot] = self::convertTypoScriptArrayToPlainArray($value);
-                               } else {
-                                       $processedSettings[$keyWithoutDot] = NULL;
-                               }
-                               if (array_key_exists($keyWithoutDot, $settings)) {
-                                       $processedSettings[$keyWithoutDot]['_typoScriptNodeValue'] = $settings[$keyWithoutDot];
-                                       unset($settings[$keyWithoutDot]);
-                               }
-                       } else {
-                               $keyWithDot = $key . '.';
-                               if (array_key_exists($keyWithDot, $settings)) {
-                                       $processedSettings[$key] = self::convertTypoScriptArrayToPlainArray($settings[$keyWithDot]);
-                                       $processedSettings[$key]['_typoScriptNodeValue'] = $value;
-                                       unset($settings[$keyWithDot]);
+                               $hasNodeWithoutDot = array_key_exists($keyWithoutDot, $settings);
+                               $typoScriptNodeValue = $hasNodeWithoutDot ? $settings[$keyWithoutDot] : NULL;
+                               if(is_array($value)) {
+                                       $settings[$keyWithoutDot] = self::convertTypoScriptArrayToPlainArray($value);
+                                       if(!is_null($typoScriptNodeValue)) {
+                                               $settings[$keyWithoutDot]['_typoScriptNodeValue']  = $typoScriptNodeValue;
+                                       }
+                                       unset($settings[$key]);
                                } else {
-                                       $processedSettings[$key] = $value;
+                                       $settings[$keyWithoutDot] = NULL;
                                }
                        }
                }
-               return $processedSettings;
+               return $settings;
        }
 
        /**
@@ -76,20 +70,20 @@ class Tx_Extbase_Utility_TypoScript {
         * However, if you want to call legacy TypoScript objects, you somehow need the "old" syntax (because this is what TYPO3 is used to).
         * With this method, you can convert the extbase TypoScript to classical TYPO3 TypoScript which is understood by the rest of TYPO3.
         *
-        * @param array $plainArray An Typoscript Array with Extbase Syntax (without dot but with _typoscriptNodeValue)
+        * @param array $plainArray An Typoscript Array with Extbase Syntax (without dot but with _typoScriptNodeValue)
         * @return array array with Typoscript as usual (with dot)
         * @api
         */
-       public static function convertPlainArrayToTypoScriptArray($plainArray) {
+       static public function convertPlainArrayToTypoScriptArray($plainArray) {
                $typoScriptArray = array();
                if (is_array($plainArray)) {
                        foreach ($plainArray as $key => $value) {
                                if (is_array($value)) {
-                                       if (isset($value['_typoscriptNodeValue'])) {
-                                               $typoScriptArray[$key] = $value['_typoscriptNodeValue'];
-                                               unset($value['_typoscriptNodeValue']);
+                                       if (isset($value['_typoScriptNodeValue'])) {
+                                               $typoScriptArray[$key] = $value['_typoScriptNodeValue'];
+                                               unset($value['_typoScriptNodeValue']);
                                        }
-                                       $typoScriptArray[$key.'.'] = Tx_Extbase_Utility_TypoScript::convertPlainArrayToTypoScriptArray($value);
+                                       $typoScriptArray[$key.'.'] = self::convertPlainArrayToTypoScriptArray($value);
                                } else {
                                        $typoScriptArray[$key] = $value;
                                }