Compatibility to TYPO3 8.7

Matteo Bonaker · Matteo Bonaker · commit 78d1ddf7bcfb · 2017-04-18T19:58:02.000+02:00
diff --git a/Classes/Miscellaneous/TtNewsUserFunctions.php b/Classes/Miscellaneous/TtNewsUserFunctions.php
@@ -93,11 +93,11 @@ public function getImageForTTnews($paramArray, $conf) {
 
 				// define the file
 				if ($row['tx_imagecycle_activate']) {
-					$image = $pObj->local_cObj->IMAGE($lConf[$imageConf]);
+					$image = $pObj->local_cObj->cObjGetSingle('IMAGE', $lConf[$imageConf]);
 					$caption = $pObj->local_cObj->stdWrap($image, $lConf['captionWrap.']);
 					$theImgCode .= $pObj->local_cObj->stdWrap($caption, $lConf['itemWrap.']);
 				} else {
-					$theImgCode .= $pObj->local_cObj->IMAGE($lConf[$imageConf]).$pObj->local_cObj->stdWrap($imgsCaptions[$cc], $lConf['caption_stdWrap.']);
+					$theImgCode .= $pObj->local_cObj->cObjGetSingle('IMAGE', $lConf[$imageConf]).$pObj->local_cObj->stdWrap($imgsCaptions[$cc], $lConf['caption_stdWrap.']);
 				}
 			}
 			$cc ++;
diff --git a/Classes/Plugin/CoinSlider.php b/Classes/Plugin/CoinSlider.php
@@ -0,0 +1,32 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2017, a7digital GmbH
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace TYPO3Extension\Imagecycle\Plugin;
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+require_once(ExtensionManagementUtility::extPath('imagecycle').'pi3/class.tx_imagecycle_pi3.php');
+
+class CoinSlider extends \tx_imagecycle_pi3 {
+
+}
diff --git a/Classes/Plugin/CrossSlider.php b/Classes/Plugin/CrossSlider.php
@@ -0,0 +1,32 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2017, a7digital GmbH
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace TYPO3Extension\Imagecycle\Plugin;
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+require_once(ExtensionManagementUtility::extPath('imagecycle').'pi3/class.tx_imagecycle_pi4.php');
+
+class CrossSlider extends \tx_imagecycle_pi4 {
+
+}
diff --git a/Classes/Plugin/ImageCycle.php b/Classes/Plugin/ImageCycle.php
@@ -0,0 +1,32 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2017, a7digital GmbH
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace TYPO3Extension\Imagecycle\Plugin;
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+require_once(ExtensionManagementUtility::extPath('imagecycle').'pi3/class.tx_imagecycle_pi1.php');
+
+class ImageCycle extends \tx_imagecycle_pi1 {
+
+}
diff --git a/Classes/Plugin/NivoSlider.php b/Classes/Plugin/NivoSlider.php
@@ -0,0 +1,32 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2017, a7digital GmbH
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace TYPO3Extension\Imagecycle\Plugin;
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+require_once(ExtensionManagementUtility::extPath('imagecycle').'pi3/class.tx_imagecycle_pi3.php');
+
+class NivoSlider extends \tx_imagecycle_pi3 {
+
+}
diff --git a/Classes/Plugin/SliceBox.php b/Classes/Plugin/SliceBox.php
@@ -0,0 +1,32 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2017, a7digital GmbH
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace TYPO3Extension\Imagecycle\Plugin;
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+require_once(ExtensionManagementUtility::extPath('imagecycle').'pi3/class.tx_imagecycle_pi5.php');
+
+class SliceBox extends \tx_imagecycle_pi5 {
+
+}
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -78,7 +78,7 @@
     )
 );
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $tempColumns, 1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $tempColumns);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('pages', '--div--;LLL:EXT:imagecycle/locallang_db.xml:pages.tx_imagecycle_div, tx_imagecycle_mode;;;;3-3-3, tx_imagecycle_damimages, tx_imagecycle_damcategories, tx_imagecycle_images, tx_imagecycle_hrefs, tx_imagecycle_captions, tx_imagecycle_effect, tx_imagecycle_stoprecursion');
 
 $GLOBALS['TCA']['pages']['ctrl']['requestUpdate'] .= ($GLOBALS['TCA']['pages']['ctrl']['requestUpdate'] ? ',' : ''). 'tx_imagecycle_mode';
diff --git a/Configuration/TCA/Overrides/pages_language_overlay.php b/Configuration/TCA/Overrides/pages_language_overlay.php
@@ -78,7 +78,7 @@
     )
 );
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages_language_overlay', $tempColumns, 1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages_language_overlay', $tempColumns);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('pages_language_overlay', '--div--;LLL:EXT:imagecycle/locallang_db.xml:pages.tx_imagecycle_div, tx_imagecycle_mode;;;;3-3-3, tx_imagecycle_damimages, tx_imagecycle_damcategories, tx_imagecycle_images, tx_imagecycle_hrefs, tx_imagecycle_captions, tx_imagecycle_effect, tx_imagecycle_stoprecursion');
 
 $GLOBALS['TCA']['pages_language_overlay']['ctrl']['requestUpdate'] .= ($GLOBALS['TCA']['pages_language_overlay']['ctrl']['requestUpdate'] ? ',' : ''). 'tx_imagecycle_mode';
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -24,7 +24,7 @@
     ),
 );
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', $tempColumns, 1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', $tempColumns);
 $GLOBALS['TCA']['tt_content']['palettes']['tx_imagecycle'] = array(
     'showitem' => 'tx_imagecycle_activate,tx_imagecycle_duration',
     'canNotCollapse' => 1,
diff --git a/Configuration/TCA/Overrides/tt_news.php b/Configuration/TCA/Overrides/tt_news.php
@@ -26,7 +26,7 @@
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/tt_news/', 'Image-Cycle for tt_news - Cycle');
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/tt_news/nivoslider/', 'Image-Cycle for tt_news - Nivo');
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_news', $tempColumns, 1);
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_news', $tempColumns);
     $GLOBALS['TCA']['tt_news']['palettes']['tx_imagecycle'] = array(
         'showitem' => 'tx_imagecycle_activate,tx_imagecycle_duration',
         'canNotCollapse' => 1,
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -23,7 +23,7 @@
 		'depends' => array(
 			'cms' => '',
 			'php' => '5.5.0-0.0.0',
-			'typo3' => '7.6.0-7.6.99',
+			'typo3' => '7.6.0-8.7.99',
 		),
 		'conflicts' => array(
 		),
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -27,4 +27,3 @@
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['formDataGroup']['flexFormSegment'][$dataProviderName]['depends'][]
         = \TYPO3Extension\Imagecycle\Form\FormDataProvider\SelectOrCheckboxField::class;
 }
-?>
diff --git a/ext_tables.php b/ext_tables.php
@@ -19,4 +19,3 @@
 
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('imagecycle').'lib/class.tx_imagecycle_itemsProcFunc.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('imagecycle').'lib/class.tx_imagecycle_TCAform.php');
-?>
diff --git a/lib/class.tx_imagecycle_pagerenderer.php b/lib/class.tx_imagecycle_pagerenderer.php
@@ -25,6 +25,7 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
@@ -58,15 +59,22 @@ public function setConf($conf) {
 		$this->conf = $conf;
 	}
 
+	/**
+	 * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+	 */
+	protected function getTypoScriptFrontendController() {
+		return $GLOBALS['TSFE'];
+	}
+
 	/**
 	* Include all defined resources (JS / CSS)
 	*
 	* @return void
 	*/
 	public function addResources() {
-		$pagerender = $GLOBALS['TSFE']->getPageRenderer();
+		$pagerender = GeneralUtility::makeInstance(PageRenderer::class);
 		// Fix moveJsFromHeaderToFooter (add all scripts to the footer)
-		if ($GLOBALS['TSFE']->config['config']['moveJsFromHeaderToFooter']) {
+		if ($this->getTypoScriptFrontendController()->config['config']['moveJsFromHeaderToFooter']) {
 			$allJsInFooter = TRUE;
 		} else {
 			$allJsInFooter = FALSE;
@@ -160,10 +168,10 @@ public function addResources() {
 	 * Return the webbased path
 	 *
 	 * @param string $path
-	 * return string
+	 * @return string
 	 */
 	public function getPath($path="") {
-		return $GLOBALS['TSFE']->tmpl->getFileName($path);
+		return $this->getTypoScriptFrontendController()->tmpl->getFileName($path);
 	}
 
 	/**
diff --git a/pi1/class.tx_imagecycle_pi1.php b/pi1/class.tx_imagecycle_pi1.php
@@ -687,7 +687,7 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 				}
 
 				$this->applyCurrentResource($totalImagePath);
-				$image = $this->cObj->IMAGE($imgConf);
+				$image = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 				$this->resetCurrentResource();
 
 				if ($item['caption'] && $this->conf['showcaption']) {
diff --git a/pi2/class.tx_imagecycle_pi2.php b/pi2/class.tx_imagecycle_pi2.php
@@ -348,14 +348,14 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 					unset($imgConf['imageLinkWrap.']);
 
 					$this->applyCurrentResource($totalImagePath);
-					$image = $this->cObj->IMAGE($imgConf);
+					$image = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 					$this->resetCurrentResource();
 
 					$imageWrap = $this->cObj->stdWrap($image, $this->conf['coin.'][$this->type.'.']['imageWrap.']);
 					$imageLink = $this->cObj->typolink($imageWrap, $this->conf['coin.'][$this->type.'.']['imageLink.']);
 				} else {
 					$this->applyCurrentResource($totalImagePath);
-					$imageLink = $this->cObj->IMAGE($imgConf);
+					$imageLink = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 					$this->resetCurrentResource();
 
 					if ($this->cObj->data['image_zoom'] != 1) {
diff --git a/pi3/class.tx_imagecycle_pi3.php b/pi3/class.tx_imagecycle_pi3.php
@@ -431,7 +431,7 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 					$thumbconf['file'] = $totalImagePath;
 					$thumbconf['file.']['width']  = $this->conf['thumbwidth'];
 					$thumbconf['file.']['height'] = $this->conf['thumbheight'];
-					$GLOBALS['TSFE']->register['thumbrel'] = $this->cObj->IMG_RESOURCE($thumbconf);
+					$GLOBALS['TSFE']->register['thumbrel'] = $this->cObj->cObjGetSingle('IMG_RESOURCE', $thumbconf);
 				} else {
 					$GLOBALS['TSFE']->register['thumbrel'] = '';
 				}
@@ -445,7 +445,7 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 				}
 
 				$this->applyCurrentResource($totalImagePath);
-				$image = $this->cObj->IMAGE($imgConf);
+				$image = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 				$this->resetCurrentResource();
 
 				$lastImageInfo = $GLOBALS['TSFE']->lastImageInfo;
diff --git a/pi4/class.tx_imagecycle_pi4.php b/pi4/class.tx_imagecycle_pi4.php
@@ -339,7 +339,7 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 				$GLOBALS['TSFE']->register['CURRENT_ID'] = $GLOBALS['TSFE']->register['IMAGE_NUM_CURRENT'] + 1;
 
 				$this->applyCurrentResource($totalImagePath);
-				$image = $this->cObj->IMAGE($imgConf);
+				$image = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 				$this->resetCurrentResource();
 
 				$lastImageInfo = $GLOBALS['TSFE']->lastImageInfo;
diff --git a/pi5/class.tx_imagecycle_pi5.php b/pi5/class.tx_imagecycle_pi5.php
@@ -363,7 +363,7 @@ public function parseTemplate($data=array(), $dir='', $onlyJS=false)
 				}
 
 				$this->applyCurrentResource($totalImagePath);
-				$image = $this->cObj->IMAGE($imgConf);
+				$image = $this->cObj->cObjGetSingle('IMAGE', $imgConf);
 				$this->resetCurrentResource();
 
 				// Add the noscript wrap to the first image
diff --git a/static/coinslider/setup.txt b/static/coinslider/setup.txt
@@ -1,4 +1,6 @@
+plugin.tx_imagecycle_pi2 = USER
 plugin.tx_imagecycle_pi2 {
+	userFunc = TYPO3Extension\Imagecycle\Plugin\CoinSlider->main
 
 	linkTarget = {$plugin.tx_imagecycle_pi1.linkTarget}
 	extlinkTarget = {$plugin.tx_imagecycle_pi1.extlinkTarget}
diff --git a/static/crossslide/setup.txt b/static/crossslide/setup.txt
@@ -1,4 +1,6 @@
+plugin.tx_imagecycle_pi4 = USER
 plugin.tx_imagecycle_pi4 {
+	userFunc = TYPO3Extension\Imagecycle\Plugin\CrossSlider->main
 
 	linkTarget = {$plugin.tx_imagecycle_pi1.linkTarget}
 	extlinkTarget = {$plugin.tx_imagecycle_pi1.extlinkTarget}
diff --git a/static/nivoslider/setup.txt b/static/nivoslider/setup.txt
@@ -1,4 +1,6 @@
+plugin.tx_imagecycle_pi3 = USER
 plugin.tx_imagecycle_pi3 {
+	userFunc = TYPO3Extension\Imagecycle\Plugin\NivoSlider->main
 
 	linkTarget = {$plugin.tx_imagecycle_pi1.linkTarget}
 	extlinkTarget = {$plugin.tx_imagecycle_pi1.extlinkTarget}
diff --git a/static/setup.txt b/static/setup.txt
@@ -1,4 +1,6 @@
+plugin.tx_imagecycle_pi1 = USER
 plugin.tx_imagecycle_pi1 {
+	userFunc = TYPO3Extension\Imagecycle\Plugin\NivoSlider->main
 
 	linkTarget = {$plugin.tx_imagecycle_pi1.linkTarget}
 	extlinkTarget = {$plugin.tx_imagecycle_pi1.extlinkTarget}
diff --git a/static/slicebox/setup.txt b/static/slicebox/setup.txt
@@ -1,4 +1,6 @@
+plugin.tx_imagecycle_pi5 = USER
 plugin.tx_imagecycle_pi5 {
+	userFunc = TYPO3Extension\Imagecycle\Plugin\SliceBox->main
 
 	linkTarget = {$plugin.tx_imagecycle_pi1.linkTarget}
 	extlinkTarget = {$plugin.tx_imagecycle_pi1.extlinkTarget}

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ public function getImageForTTnews($paramArray, $conf) {`
`93`	`93`
`94`	`94`	`// define the file`
`95`	`95`	`if ($row['tx_imagecycle_activate']) {`
`96`		`- $image = $pObj->local_cObj->IMAGE($lConf[$imageConf]);`
	`96`	`+ $image = $pObj->local_cObj->cObjGetSingle('IMAGE', $lConf[$imageConf]);`
`97`	`97`	`$caption = $pObj->local_cObj->stdWrap($image, $lConf['captionWrap.']);`
`98`	`98`	`$theImgCode .= $pObj->local_cObj->stdWrap($caption, $lConf['itemWrap.']);`
`99`	`99`	`} else {`
`100`		`- $theImgCode .= $pObj->local_cObj->IMAGE($lConf[$imageConf]).$pObj->local_cObj->stdWrap($imgsCaptions[$cc], $lConf['caption_stdWrap.']);`
	`100`	`+ $theImgCode .= $pObj->local_cObj->cObjGetSingle('IMAGE', $lConf[$imageConf]).$pObj->local_cObj->stdWrap($imgsCaptions[$cc], $lConf['caption_stdWrap.']);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`$cc ++;`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`)`
`79`	`79`	`);`
`80`	`80`
`81`		`-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $tempColumns, 1);`
	`81`	`+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $tempColumns);`
`82`	`82`	`\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('pages', '--div--;LLL:EXT:imagecycle/locallang_db.xml:pages.tx_imagecycle_div, tx_imagecycle_mode;;;;3-3-3, tx_imagecycle_damimages, tx_imagecycle_damcategories, tx_imagecycle_images, tx_imagecycle_hrefs, tx_imagecycle_captions, tx_imagecycle_effect, tx_imagecycle_stoprecursion');`
`83`	`83`
`84`	`84`	`$GLOBALS['TCA']['pages']['ctrl']['requestUpdate'] .= ($GLOBALS['TCA']['pages']['ctrl']['requestUpdate'] ? ',' : ''). 'tx_imagecycle_mode';`