From ccf4c783515bf27be65a180d552d1534c5fb7d50 Mon Sep 17 00:00:00 2001
From: Paul Ilea <paul@sgalinski.de>
Date: Wed, 11 Oct 2017 11:52:12 +0300
Subject: [PATCH] [TASK] Backend utility class rename, typo3 v7 compatibility
update
---
Classes/Controller/BackendController.php | 2 +-
Classes/Hooks/EditDocumentController.php | 2 +-
Classes/{Service => Utility}/BackendNewsUtility.php | 9 +++++++--
Classes/ViewHelpers/Backend/EditOnClickViewHelper.php | 2 +-
.../ViewHelpers/Backend/TranslationLinksViewHelper.php | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
rename Classes/{Service => Utility}/BackendNewsUtility.php (97%)
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index ba3e695..4bf0ffb 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -27,8 +27,8 @@ namespace SGalinski\SgNews\Controller;
***************************************************************/
use In2code\Powermail\Utility\LocalizationUtility;
-use SGalinski\SgNews\Service\BackendNewsUtility;
use SGalinski\SgNews\Service\LicensingService;
+use SGalinski\SgNews\Utility\BackendNewsUtility;
use TYPO3\CMS\Backend\Clipboard\Clipboard;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
diff --git a/Classes/Hooks/EditDocumentController.php b/Classes/Hooks/EditDocumentController.php
index 879bdee..20dde30 100644
--- a/Classes/Hooks/EditDocumentController.php
+++ b/Classes/Hooks/EditDocumentController.php
@@ -25,7 +25,7 @@ namespace SGalinski\SgNews\Hooks;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-use SGalinski\SgNews\Service\BackendNewsUtility;
+use SGalinski\SgNews\Utility\BackendNewsUtility;
use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
diff --git a/Classes/Service/BackendNewsUtility.php b/Classes/Utility/BackendNewsUtility.php
similarity index 97%
rename from Classes/Service/BackendNewsUtility.php
rename to Classes/Utility/BackendNewsUtility.php
index a2eade6..b4e7198 100644
--- a/Classes/Service/BackendNewsUtility.php
+++ b/Classes/Utility/BackendNewsUtility.php
@@ -1,6 +1,6 @@
<?php
-namespace SGalinski\SgNews\Service;
+namespace SGalinski\SgNews\Utility;
/***************************************************************
* Copyright notice
@@ -32,6 +32,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Database\QueryGenerator;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
@@ -390,8 +391,12 @@ class BackendNewsUtility {
];
/** @var DatabaseConnection $databaseConnection */
$databaseConnection = $GLOBALS['TYPO3_DB'];
+ $orderBy = '';
+ if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 8000000) {
+ $orderBy = 'sorting';
+ }
$languageRows = $databaseConnection->exec_SELECTgetRows(
- 'uid, title, flag', 'sys_language', 'hidden = 0', '', 'sorting'
+ 'uid, title, flag', 'sys_language', 'hidden = 0', '', $orderBy
);
if ($languageRows) {
/** @var BackendUserAuthentication $backendUser */
diff --git a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
index fb6cda9..7ef9850 100644
--- a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
+++ b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
@@ -26,7 +26,7 @@ namespace SGalinski\SgNews\ViewHelpers\Backend;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-use SGalinski\SgNews\Service\BackendNewsUtility;
+use SGalinski\SgNews\Utility\BackendNewsUtility;
use SGalinski\SgNews\ViewHelpers\AbstractViewHelper;
use TYPO3\CMS\Backend\Utility\BackendUtility;
diff --git a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
index bf9f22d..d670813 100644
--- a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
+++ b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
@@ -26,8 +26,8 @@ namespace SGalinski\SgNews\ViewHelpers\Backend;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-use SGalinski\SgNews\Service\BackendNewsUtility;
use SGalinski\SgNews\Service\LicensingService;
+use SGalinski\SgNews\Utility\BackendNewsUtility;
use SGalinski\SgNews\ViewHelpers\AbstractViewHelper;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
--
GitLab