Cleanup
authorstan <stan@735d13b6-9817-0410-8766-e36946ffe9aa>
Mon, 12 Oct 2015 22:17:17 +0000 (22:17 +0000)
committerstan <stan@735d13b6-9817-0410-8766-e36946ffe9aa>
Mon, 12 Oct 2015 22:17:17 +0000 (22:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/sr_freecap/trunk@89880 735d13b6-9817-0410-8766-e36946ffe9aa

ChangeLog
Classes/Utility/EidUtility.php
Configuration/TypoScript/FontMaker/setup.txt

index 1363dac..e3e820a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-11  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Cleanup
+
 2015-03-31  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Resolves #64524: SJBR\SrFreecap\Domain\Model\Font raises warning on PHP 5.4+
index de72d04..c60ff09 100644 (file)
@@ -123,11 +123,7 @@ class EidUtility {
                $bootstrap->initialize($configuration);
                $request = $this->buildRequest();
                /* @var $response \TYPO3\CMS\Extbase\Mvc\Web\Response */
-               if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 6001000) {
-                       $response = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
-               } else {
-                       $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
-               }
+               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
                /* @var $dispatcher \TYPO3\CMS\Extbase\Mvc\Dispatcher */
                $dispatcher = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Dispatcher');
                $dispatcher->dispatch($request, $response);
@@ -143,10 +139,6 @@ class EidUtility {
         * @return \SJBR\SrFreecap\Utility\EidDispatcher
         */
        protected function initTypoScriptFrontendController() {
-               if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 6001000) {
-                       //Connect to database
-                       \TYPO3\CMS\Frontend\Utility\EidUtility::connectDB();
-               }
                // Get page uid and mount point, if any
                $this->pageUid = GeneralUtility::_GET('id');
                if (!isset($this->pageUid)) {
@@ -159,9 +151,6 @@ class EidUtility {
                $GLOBALS['TSFE']->sys_page = $this->objectManager->get('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
                $GLOBALS['TSFE']->initFeUser();
                $GLOBALS['TSFE']->determineId();
-               if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 6001000) {
-                       $GLOBALS['TSFE']->getCompressedTCarray();
-               }
                return $this;
        }
 
@@ -236,11 +225,7 @@ class EidUtility {
        protected function setRequestArgumentsFromJSON($request) {
                $requestArray = json_decode($request, TRUE);
                if (is_array($requestArray)) {
-                       if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 6002000) {
-                               $this->requestArguments = GeneralUtility::array_merge_recursive_overrule($this->requestArguments, $requestArray);
-                       } else {
-                               \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($this->requestArguments, $requestArray);
-                       }
+                       \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($this->requestArguments, $requestArray);
                }
        }
 
@@ -325,5 +310,4 @@ class EidUtility {
                }
                return $this;
        }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
index ad9b493..d3b6c7c 100644 (file)
@@ -1,6 +1,5 @@
 ## Configuring the Font Maker backend module
 module.tx_srfreecap {
-       features.rewrittenPropertyMapper = 1
        ## Paths for backend templates
        view {
                templateRootPaths.0 = EXT:sr_freecap/Resources/Private/Backend/Templates/