[TASK] Follow-up to Cleanup extension configuration 37/51337/2
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 18 Jan 2017 03:40:07 +0000 (22:40 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 18 Jan 2017 03:41:46 +0000 (04:41 +0100)
Change-Id: Idbee270565217ffe7a9f2aeb6289ecf6ebf26748
Resolves: #79207
Reviewed-on: https://review.typo3.org/51337
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
ChangeLog
ext_localconf.php

index c81d757..24ad19b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Resolves #79359: Migrate PiBaseApi to Doctrine
        * Follow-up to Resolves #79229: Migrate suggest receiver to Doctrine
+       * Follow-up to Resolves #79207: Cleanup extension configuration
 
 2017-01-10  Stanislas Rolland  <typo3(arobas)sjbr.ca>
 
index 3ae20e3..fc1991a 100644 (file)
@@ -90,9 +90,13 @@ $dispatcher->connect(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
 $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['static_info_tables']['enableManager'] = isset($extConf['enableManager']) ? $extConf['enableManager'] : '0';
 
 // Make the extension version and constraints available when creating language packs and to other extensions
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('static_info_tables') . 'ext_emconf.php');
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['static_info_tables']['version'] = $EM_CONF['static_info_tables']['version'];
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['static_info_tables']['constraints'] = $EM_CONF['static_info_tables']['constraints'];
+$emConfUtility = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class);
+$emConf = $emConfUtility->includeEmConf(['key' => 'static_info_tables', 'siteRelPath' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('static_info_tables')]);
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['static_info_tables']['version'] = $emConf['static_info_tables']['version'];
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['static_info_tables']['constraints'] = $emConf['static_info_tables']['constraints'];
 
 unset($labelTable);
-unset($extConf);
\ No newline at end of file
+unset($extConf);
+unset($dispatcher);
+unset($emConfUtility);
+unset($emConf);
\ No newline at end of file