[TASK] Backport EM Update script and TS Cache to legacy branch (#1296)

* [FEATURE] Fix records references in EM update script

Enable the update script, which may be run in the
extension manager, to fix records with wrong
references (wrongly assigned »flux parent«) automatically.

Refs #1176

* [BUGFIX] Always cache TypoScript config in FluxService

Previously, #getAllTypoScript did not cache the configuration when
called from the frontend. This resulted in a rather large performance
overhead, since #removeDotsFromTS was called repeatedly. This commit
modifies the behaviour such that the configuration is always cached.

Backport of commit:f876ffdcdf8e4e76eda1b62409138f6361e32bd1 for legacy branch

Refs #1140

* [TASK] Add note about legacy branch

* Add a hint how PRs for the legacy branch are handled.
* Show in EM that this is a legacy branch version

Classes/Service/FluxService.php

@@ -340,14 +340,25 @@ public function getTypoScriptByPath($path) {
 	 * @return array
 	 */
 	public function getAllTypoScript() {
-		$pageId = $this->configurationManager->getCurrentPageId();
+		$pageId = $this->getCurrentPageId();
 		if (FALSE === isset(self::$typoScript[$pageId])) {
 			self::$typoScript[$pageId] = (array) $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
 			self::$typoScript[$pageId] = GeneralUtility::removeDotsFromTS(self::$typoScript[$pageId]);
 		}
 		return (array) self::$typoScript[$pageId];
 	}
 
+	/**
+	 * @return integer
+	 */
+	protected function getCurrentPageId() {
+		if ($this->configurationManager instanceof BackendConfigurationManager) {
+			return (integer) $this->configurationManager->getCurrentPageId();
+		} else {
+			return (integer) $GLOBALS['TSFE']->id;
+		}
+	}
+
 	/**
 	 * ResolveUtility the top-priority ConfigurationPrivider which can provide
 	 * a working FlexForm configuration baed on the given parameters.

README.md

@@ -5,6 +5,14 @@ Flux: Fluid FlexForms
 
 [![Build Status](https://img.shields.io/travis/FluidTYPO3/flux.svg?style=flat-square&label=package)](https://travis-ci.org/FluidTYPO3/flux/) [![Coverage Status](https://img.shields.io/coveralls/FluidTYPO3/flux/development.svg?style=flat-square)](https://coveralls.io/r/FluidTYPO3/flux)  [![Documentation](http://img.shields.io/badge/documentation-online-blue.svg?style=flat-square)](https://fluidtypo3.org/documentation/templating-manual/introduction.html) [![Build Status](https://img.shields.io/travis/FluidTYPO3/fluidtypo3-testing.svg?style=flat-square&label=framework)](https://travis-ci.org/FluidTYPO3/fluidtypo3-testing/) [![Coverage Status](https://img.shields.io/coveralls/FluidTYPO3/fluidtypo3-testing/master.svg?style=flat-square)](https://coveralls.io/r/FluidTYPO3/fluidtypo3-testing)
 
+---
+
+:bangbang: **Legacy branch** :hand:
+
+*Please note that this is a legacy branch for flux in TYPO3 6.2. This version is no longer supported by the Flux team, but we are happy to keep [merging pull requests into the legacy branch](https://github.com/FluidTYPO3/flux/issues/1149#issuecomment-223269520) as long as users keep making them.*
+
+---
+
 > Flux is a replacement API for TYPO3 FlexForms - with interfaces for Fluid, PHP and TypoScript
 
 Flux lets you build and modify forms in Fluid:

Tests/Unit/Service/FluxServiceTest.php

@@ -339,4 +339,18 @@ public function getConvertFlexFormContentToArrayTestValues() {
 		);
 	}
 
+	/**
+	 * @test
+	 */
+	public function testGetAllTypoScriptCache() {
+		$fluxService = $this->createFluxServiceInstance(array('getCurrentPageId'));
+
+		$configurationManager = $this->getMock('FluidTYPO3\Flux\Configuration\ConfigurationManager', array('getConfiguration'));
+		$fluxService->injectConfigurationManager($configurationManager);
+		$configurationManager->expects($this->once())->method('getConfiguration');
+
+		$this->assertNotNull($fluxService->getAllTypoScript());
+		$this->assertNotNull($fluxService->getAllTypoScript());
+	}
+
 }

class.ext_update.php

@@ -6,24 +6,37 @@
  * Performs update tasks for extension flux
  */
  // @codingStandardsIgnoreStart
-class ext_update {
+class ext_update
+{
 
 	/**
 	 * @return boolean
 	 */
 	public function access() {
-		return TRUE;
+		return true;
 	}
 
 	/**
 	 * @return string
 	 */
 	public function main() {
-		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'colPos = -42', array('colPos' => 18181));
+		$content = '';
+
+		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'colPos = -42', ['colPos' => 18181]);
+		$content .= 'Switch to positive colPos (see #477): ' .
+			$GLOBALS['TYPO3_DB']->sql_affected_rows() . ' rows affected' . PHP_EOL;
+
+		// Fix records with wrong references (see #1176)
+		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'tx_flux_parent > 0 AND tx_flux_column = \'\'', ['tx_flux_parent' => 0]);
+		$content .= 'Fix records with wrong references (see #1176): ' .
+			$GLOBALS['TYPO3_DB']->sql_affected_rows() . ' rows affected' . PHP_EOL;
+
 		$GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('cf_extbase_reflection');
 		$GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('cf_extbase_reflection_tags');
 		$GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('cf_extbase_object');
 		$GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('cf_extbase_object_tags');
-		return $GLOBALS['TYPO3_DB']->sql_affected_rows() . ' rows have been updated. System object caches cleared.';
+		$content .= 'System object caches cleared.' . PHP_EOL;
+
+		return nl2br($content);
 	}
 }

ext_emconf.php

@@ -11,7 +11,7 @@
  ***************************************************************/
 
 $EM_CONF[$_EXTKEY] = array(
-	'title' => 'Flux: Fluid FlexForms',
+	'title' => 'Flux: Fluid FlexForms (Legacy Branch)',
 	'description' => 'Backend form and frontend content rendering assistance API with focus on productivity.',
 	'category' => 'misc',
 	'shy' => 0,