Merge pull request #42 from IchHabRecht/upgrade-nimut-testing-framework

IchHabRecht · Sep 2, 2017 · 7646e54 · 7646e54
2 parents 9c4e332 + ddd64f6
commit 7646e54
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 27 deletions.
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -24,7 +24,7 @@
             $sortedItems[] = [
                 'LLL:EXT:multicolumn/locallang_db.xml:tx_multicolumn_multicolumn',
                 'multicolumn',
-                \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('multicolumn') . 'tt_content_multicolumn.gif',
+                'EXT:multicolumn/tt_content_multicolumn.gif',
             ];
             $multicolumnAdded = true;
         }
@@ -45,7 +45,7 @@
         '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime, fe_group',
 ];
 
-$GLOBALS['TCA']['tt_content']['ctrl']['typeicons']['multicolumn'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('multicolumn') . 'tt_content_multicolumn.gif';
+$GLOBALS['TCA']['tt_content']['ctrl']['typeicons']['multicolumn'] = 'EXT:multicolumn/tt_content_multicolumn.gif';
 
 // Add tx_multicolumn_parentid to tt_content table
 $tempColumns = [

diff --git a/Tests/Functional/Hooks/DefaultLanguage/CopyTest.php b/Tests/Functional/Hooks/DefaultLanguage/CopyTest.php
@@ -48,7 +48,7 @@ public function copyContainerAndChildrenToOtherColumnInDefaultLanguage()
         $containerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][1];
         $childUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -60,7 +60,7 @@ public function copyContainerAndChildrenToOtherColumnInDefaultLanguage()
         );
         $this->assertSame(1, $count);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid
@@ -104,7 +104,7 @@ public function copyContainerAndChildrenToOtherPageInDefaultLanguage()
         $containerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][1];
         $childUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -116,7 +116,7 @@ public function copyContainerAndChildrenToOtherPageInDefaultLanguage()
         );
         $this->assertSame(1, $count);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid
@@ -159,7 +159,7 @@ public function copyChildFromContainerToOtherColumnInDefaultLanguage()
 
         $copiedUID = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $copiedUID
@@ -193,7 +193,7 @@ public function copyRecordIntoContainerAfterRecordInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'pid=1'
@@ -230,7 +230,7 @@ public function copyContainerAndChildrenToOtherContainerInDefaultLanguage()
         $containerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][1];
         $childUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -242,7 +242,7 @@ public function copyContainerAndChildrenToOtherContainerInDefaultLanguage()
         );
         $this->assertSame(1, $count);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid

diff --git a/Tests/Functional/Hooks/DefaultLanguage/DeleteTest.php b/Tests/Functional/Hooks/DefaultLanguage/DeleteTest.php
@@ -38,7 +38,7 @@ public function deleteContainerDeletesChildrenInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid IN (1,2)'

diff --git a/Tests/Functional/Hooks/DefaultLanguage/NewTest.php b/Tests/Functional/Hooks/DefaultLanguage/NewTest.php
@@ -45,7 +45,7 @@ public function addContainerToEmptyPageInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'pid=2'
@@ -84,7 +84,7 @@ public function addContainerToPageWithContainerInDifferentColumnInDefaultLanguag
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'pid=1'
@@ -123,7 +123,7 @@ public function addContainerToPageWithContainerInSameColumnInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'pid=1'
@@ -162,7 +162,7 @@ public function addContainerToOtherContainerInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'pid=1'

diff --git a/Tests/Functional/Hooks/DefaultLanguage/PasteTest.php b/Tests/Functional/Hooks/DefaultLanguage/PasteTest.php
@@ -131,7 +131,7 @@ public function pasteRecordIntoContainerInDefaultLanguage()
 
         $this->assertNoProssesingErrorsInDataHandler($dataHandler);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=3'

diff --git a/Tests/Functional/Hooks/Translation/CopyTest.php b/Tests/Functional/Hooks/Translation/CopyTest.php
@@ -48,7 +48,7 @@ public function copyContainerAndChildrenToOtherColumnInOtherLanguage()
         $containerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][1];
         $childUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -61,7 +61,7 @@ public function copyContainerAndChildrenToOtherColumnInOtherLanguage()
         );
         $this->assertSame(1, $count);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid

diff --git a/Tests/Functional/Hooks/Translation/LocalizeTest.php b/Tests/Functional/Hooks/Translation/LocalizeTest.php
@@ -41,7 +41,7 @@ public function localizeContainerAndChildrenFromDefaultLanguage()
         $containerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][1];
         $childUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][2];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -54,7 +54,7 @@ public function localizeContainerAndChildrenFromDefaultLanguage()
         );
         $this->assertSame(1, $count);
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid
@@ -97,7 +97,7 @@ public function localizeNestedContainersAndChildrenFromDefaultLanguage()
         $nestedContainerUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][4];
         $nestedChildUid = $dataHandler->copyMappingArray[tx_multicolumn_tcemainBaseTest::CONTENT_TABLE][5];
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $containerUid
@@ -110,7 +110,7 @@ public function localizeNestedContainersAndChildrenFromDefaultLanguage()
         );
         $this->assertSame(1, $count, 'Container was not found');
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $childUid
@@ -123,7 +123,7 @@ public function localizeNestedContainersAndChildrenFromDefaultLanguage()
         );
         $this->assertSame(1, $count, 'Child was not found');
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $nestedContainerUid
@@ -136,7 +136,7 @@ public function localizeNestedContainersAndChildrenFromDefaultLanguage()
         );
         $this->assertSame(1, $count, 'Nested container was not found');
 
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows(
+        $count = $this->getDatabaseConnection()->selectCount(
             '*',
             tx_multicolumn_tcemainBaseTest::CONTENT_TABLE,
             'uid=' . $nestedChildUid

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "typo3/cms-core": ">=7.6.0,<8.8.0"
   },
   "require-dev": {
-    "nimut/testing-framework": "1.x-dev",
+    "nimut/testing-framework": "2.x-dev",
     "phpunit/phpunit": "^4.8"
   },
   "suggest": {

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -5,7 +5,6 @@
 
 // define multicolumn path
 define('PATH_tx_multicolumn', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('multicolumn'));
-define('PATH_tx_multicolumn_rel', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('multicolumn'));
 
 //hooks
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = 'tx_multicolumn_tcemain';

diff --git a/hooks/class.tx_multicolumn_tt_content_drawItem.php b/hooks/class.tx_multicolumn_tt_content_drawItem.php
@@ -104,7 +104,7 @@ public function preProcess(\TYPO3\CMS\Backend\View\PageLayoutView &$parentObject
         // return if not multicolumn
         if ($row['CType'] == 'multicolumn') {
             $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-            $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('multicolumn') . $this->cssFile, 'stylesheet', 'screen');
+            $pageRenderer->addCssFile('EXT:multicolumn/' . $this->cssFile, 'stylesheet', 'screen');
 
             $this->flex = GeneralUtility::makeInstance('tx_multicolumn_flexform', $row['pi_flexform']);
             $this->pObj = $parentObject;