diff --git a/Classes/Controller/SessionController.php b/Classes/Controller/SessionController.php
index 13e46d7..975507e 100644
--- a/Classes/Controller/SessionController.php
+++ b/Classes/Controller/SessionController.php
@@ -1,6 +1,11 @@
sessionRepository = $sessionRepository;
}
/**
* Injects the BackendUserRepository-Repository
- *
- * @param \Fixpunkt\Backendtools\Domain\Repository\BackendUserRepository $backendUserRepository
*/
public function injectBackendUserRepository(\Fixpunkt\Backendtools\Domain\Repository\BackendUserRepository $backendUserRepository)
{
@@ -103,7 +104,7 @@ public function listAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('list', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('list');
$default->setValue1(0);
$default->setValue2(0);
@@ -175,7 +176,7 @@ public function listAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -228,7 +229,7 @@ public function latestAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('latest', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('latest');
$default->setValue1(0);
$default->setValue2(0);
@@ -284,7 +285,7 @@ public function latestAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -338,9 +339,7 @@ public function latestAction(): ResponseInterface
$pages[$key]['sorting'] = $page['ptstamp'];
}
}
- usort($pages, function($a, $b) {
- return $b['sorting'] <=> $a['sorting'];
- });
+ usort($pages, fn($a, $b) => $b['sorting'] <=> $a['sorting']);
$arrayPaginator = new ArrayPaginator($pages, $currentPage, $this->settings['pagebrowser']['itemsPerPage']);
$pagination = new SimplePagination($arrayPaginator);
@@ -375,7 +374,7 @@ public function layoutsAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('layouts', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('layouts');
$default->setValue1(0);
$default->setValue2(0);
@@ -421,7 +420,7 @@ public function layoutsAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -463,7 +462,7 @@ public function filedeletionAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('filedeletion', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('filedeletion');
$default->setValue1(0);
$default->setValue2(0);
@@ -497,7 +496,7 @@ public function filedeletionAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -510,7 +509,7 @@ public function filedeletionAction(): ResponseInterface
if ($delfile) {
$total=0;
$success=0;
- $filename = \TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/' . 'fileadmin/' . $delfile;
+ $filename = Environment::getPublicPath() . '/' . 'fileadmin/' . $delfile;
if (is_file($filename) && file_exists($filename)) {
if (!$method) $content .= "This is the file content:
\n";
$filecontent = fopen($filename,"r");
@@ -562,7 +561,7 @@ public function imagesAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('images', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('images');
$default->setValue1(0);
$default->setValue2(0);
@@ -612,7 +611,7 @@ public function imagesAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -630,10 +629,10 @@ public function imagesAction(): ResponseInterface
else if ($imgArray['meta_title'])
$finalArray[$key]['ref_alt'] = $imgArray['meta_title'];
else {
- if (strrpos($imgArray['name'], '.') > 0)
- $finalArray[$key]['ref_alt'] = trim(str_replace('_', ' ', substr($imgArray['name'], 0, strrpos($imgArray['name'], '.'))));
+ if (strrpos((string) $imgArray['name'], '.') > 0)
+ $finalArray[$key]['ref_alt'] = trim(str_replace('_', ' ', substr((string) $imgArray['name'], 0, strrpos((string) $imgArray['name'], '.'))));
else
- $finalArray[$key]['ref_alt'] = trim(str_replace('_', ' ', $imgArray['name']));
+ $finalArray[$key]['ref_alt'] = trim(str_replace('_', ' ', (string) $imgArray['name']));
}
$success = $this->sessionRepository->setAltOrTitle($uid, $finalArray[$key]['ref_alt'], '');
if ($success) {
@@ -652,10 +651,10 @@ public function imagesAction(): ResponseInterface
else if ($imgArray['meta_alt'])
$finalArray[$key]['ref_title'] = $imgArray['meta_alt'];
else {
- if (strrpos($imgArray['name'], '.') > 0)
- $finalArray[$key]['ref_title'] = trim(str_replace('_', ' ', substr($imgArray['name'], 0, strrpos($imgArray['name'], '.'))));
+ if (strrpos((string) $imgArray['name'], '.') > 0)
+ $finalArray[$key]['ref_title'] = trim(str_replace('_', ' ', substr((string) $imgArray['name'], 0, strrpos((string) $imgArray['name'], '.'))));
else
- $finalArray[$key]['ref_title'] = trim(str_replace('_', ' ', $imgArray['name']));
+ $finalArray[$key]['ref_title'] = trim(str_replace('_', ' ', (string) $imgArray['name']));
}
$success = $this->sessionRepository->setAltOrTitle($uid, '', $finalArray[$key]['ref_title']);
if ($success) {
@@ -700,7 +699,7 @@ public function missingAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('missing', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('missing');
$default->setValue1(0);
$default->setValue2(0);
@@ -749,7 +748,7 @@ public function missingAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -789,7 +788,7 @@ public function pagesearchAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('pagesearch', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('pagesearch');
$default->setValue1(0);
} else {
@@ -840,7 +839,7 @@ public function pagesearchAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -852,10 +851,10 @@ public function pagesearchAction(): ResponseInterface
if ($linkto_uid > 0) {
$pages = $this->sessionRepository->getPageLinks($my_c, $my_p, $linkto_uid);
if ($exttoo) {
- if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('news')) {
+ if (ExtensionManagementUtility::isLoaded('news')) {
$news = $this->sessionRepository->getNewsLinks($my_c, $my_p, $linkto_uid);
}
- if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('camaliga')) {
+ if (ExtensionManagementUtility::isLoaded('camaliga')) {
$camaliga = $this->sessionRepository->getCamaligaLinks($my_c, $my_p, $linkto_uid);
}
}
@@ -898,7 +897,7 @@ public function redirectsAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('redirects', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('redirects');
$default->setValue1(0);
$default->setValue2(0);
@@ -936,7 +935,7 @@ public function redirectsAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -948,7 +947,7 @@ public function redirectsAction(): ResponseInterface
$regexp = ($regex) ? 1 : 0;
$treffer = [];
$rewrites = [];
- $filename = \TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/' . 'fileadmin/' . $impfile;
+ $filename = Environment::getPublicPath() . '/' . 'fileadmin/' . $impfile;
if (is_file($filename) && file_exists($filename)) {
$content .= "This is the result of the file content:
\n";
$filecontent = fopen($filename,"r");
@@ -957,13 +956,13 @@ public function redirectsAction(): ResponseInterface
if ($convert == 'iso') $row = utf8_decode ( $row );
if ($convert == 'utf8') $row = utf8_encode ( $row );
$row = preg_replace('/[ ]{2,}|[\t]/', ' ', trim($row)); // tab und/oder mehrere Spaces zu einem Space umwandeln
- $rewrites = explode(' ', $row);
+ $rewrites = explode(' ', (string) $row);
preg_match('/R=(\d+)/', $rewrites[3], $treffer);
$statuscode = $treffer[1];
if (!$statuscode) {
$statuscode = intval($defaultstatuscode);
}
- if ($rewrites[1] && (substr($rewrites[1], 0, 2) != '^/') && (substr($rewrites[1], 0, 1) == '^')) {
+ if ($rewrites[1] && (!str_starts_with($rewrites[1], '^/')) && (str_starts_with($rewrites[1], '^'))) {
if ($regexp) {
$rewrites[1] = '^/' . substr($rewrites[1], 1); // aus ^xyz wird ^/xyz
} else {
@@ -1020,7 +1019,7 @@ public function redirectscheckAction(): ResponseInterface
$result = $this->sessionRepository->findByAction('redirectscheck', $beuser_id);
if ($result->count() == 0) {
$new = TRUE;
- $default = GeneralUtility::makeInstance('Fixpunkt\\Backendtools\\Domain\\Model\\Session');
+ $default = GeneralUtility::makeInstance(Session::class);
$default->setAction('redirectscheck');
$default->setValue1(0);
$default->setValue2(0);
@@ -1061,7 +1060,7 @@ public function redirectscheckAction(): ResponseInterface
$user = $this->backendUserRepository->findByUid($beuser_id);
$default->setBeuser($user);
$this->sessionRepository->add($default);
- $persistenceManager = GeneralUtility::makeInstance("TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager");
+ $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
$persistenceManager->persistAll();
} else {
$this->sessionRepository->update($default);
@@ -1099,7 +1098,7 @@ public function redirectscheckAction(): ResponseInterface
$target = $redirect['target'];
// Wir überprüfen den Status nur für die aktuelle Seite!
if (($i >= $limit_from) && ($i < $limit_to)) {
- if ((substr($target, 0, 1) == '/') && ($my_error != 1)) {
+ if ((str_starts_with((string) $target, '/')) && ($my_error != 1)) {
if ($host == '*') {
$checkHosts = $hostsArray;
} else {
@@ -1109,11 +1108,11 @@ public function redirectscheckAction(): ResponseInterface
foreach ($checkHosts as $checkHost) {
$headers = @get_headers($checkHost . $target);
if (is_array($headers) && isset($headers[0])) {
- if (strpos($headers[0], '200')) {
+ if (strpos((string) $headers[0], '200')) {
$status = 'OK';
break;
} else {
- $code = intval(substr($headers[0], 9, 3));
+ $code = intval(substr((string) $headers[0], 9, 3));
if ($code) {
$status = $code; //$headers[0];
} else {
@@ -1129,8 +1128,8 @@ public function redirectscheckAction(): ResponseInterface
$errorCount++;
$match = true;
}
- } else if ((substr($target, 0, 3) == 't3:') && ($my_error < 2)) {
- $parts = explode('=', $target);
+ } else if ((str_starts_with((string) $target, 't3:')) && ($my_error < 2)) {
+ $parts = explode('=', (string) $target);
[$pre, $rowid] = $parts;
$rowid = (int)$rowid;
$parts = explode('?', $pre);
@@ -1154,13 +1153,13 @@ public function redirectscheckAction(): ResponseInterface
} else {
$status = 'unknown table ' . $table;
}
- } else if ((substr($target, 0, 4) == 'http') && ($my_error != 1)) {
+ } else if ((str_starts_with((string) $target, 'http')) && ($my_error != 1)) {
$headers = @get_headers($target);
if (is_array($headers) && isset($headers[0])) {
- if (strpos($headers[0], '200')) {
+ if (strpos((string) $headers[0], '200')) {
$status = 'OK';
} else {
- $code = intval(substr($headers[0], 9, 3));
+ $code = intval(substr((string) $headers[0], 9, 3));
if ($code) {
$status = $code; //$headers[0];
} else {
@@ -1220,9 +1219,9 @@ public function redirectscheckAction(): ResponseInterface
function formatBytes($size, $precision = 2)
{
$base = log($size) / log(1024);
- $suffixes = array('', 'k', 'M', 'G', 'T');
+ $suffixes = ['', 'k', 'M', 'G', 'T'];
- return round(pow(1024, $base - floor($base)), $precision) .' '. $suffixes[floor($base)] .'B';
+ return round(1024 ** ($base - floor($base)), $precision) .' '. $suffixes[floor($base)] .'B';
}
/**
@@ -1234,11 +1233,11 @@ function formatBytes($size, $precision = 2)
*/
function formatHost($host, $http)
{
- if ((strlen($host) > 2) && (substr($host,0, 4) != 'http')) {
+ if ((strlen($host) > 2) && (!str_starts_with($host, 'http'))) {
$pre = ($http) ? 'http://' : 'https://';
$host = $pre . $host;
}
- if (substr($host, -1) == '/') {
+ if (str_ends_with($host, '/')) {
$host = substr($host,0,-1);
}
return $host;
diff --git a/Classes/Domain/Model/BackendUser.php b/Classes/Domain/Model/BackendUser.php
index 7e1a0bd..e3ada49 100644
--- a/Classes/Domain/Model/BackendUser.php
+++ b/Classes/Domain/Model/BackendUser.php
@@ -29,8 +29,8 @@ class BackendUser extends AbstractEntity
{
/**
* @var string
- * @Extbase\Validate("NotEmpty")
*/
+ #[Extbase\Validate(['validator' => 'NotEmpty'])]
protected $userName = '';
/**
diff --git a/Classes/Domain/Model/Session.php b/Classes/Domain/Model/Session.php
index 245c934..faf0175 100644
--- a/Classes/Domain/Model/Session.php
+++ b/Classes/Domain/Model/Session.php
@@ -1,6 +1,7 @@
'NotEmpty'])]
protected $action = '';
/**
@@ -101,7 +102,7 @@ class Session extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
/**
* beuser
*
- * @var \Fixpunkt\Backendtools\Domain\Model\BackendUser
+ * @var BackendUser
*/
protected $beuser = null;
@@ -298,7 +299,7 @@ public function setPagestart($pagestart)
/**
* Returns the beuser
*
- * @return \Fixpunkt\Backendtools\Domain\Model\BackendUser $beuser
+ * @return BackendUser $beuser
*/
public function getBeuser()
{
@@ -308,10 +309,9 @@ public function getBeuser()
/**
* Sets the beuser
*
- * @param \Fixpunkt\Backendtools\Domain\Model\BackendUser $beuser
* @return void
*/
- public function setBeuser(\Fixpunkt\Backendtools\Domain\Model\BackendUser $beuser)
+ public function setBeuser(BackendUser $beuser)
{
$this->beuser = $beuser;
}
diff --git a/Classes/Domain/Repository/SessionRepository.php b/Classes/Domain/Repository/SessionRepository.php
index d982bd8..6f8c351 100644
--- a/Classes/Domain/Repository/SessionRepository.php
+++ b/Classes/Domain/Repository/SessionRepository.php
@@ -1,6 +1,9 @@
andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tt_content.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tt_content.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -182,11 +185,11 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
}
if ($my_p==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->gt('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->andX(
+ $queryBuilder->expr()->and(
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -197,7 +200,7 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -217,13 +220,11 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
}
} else {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
- $queryBuilder->expr()->andX(
- $queryBuilder->expr()->neq('tt_content.list_type', $queryBuilder->createNamedParameter('')),
- $queryBuilder->expr()->neq('tt_content.list_type', $queryBuilder->createNamedParameter('0'))
- ),
- $queryBuilder->expr()->notIn('tt_content.CType', $queryBuilder->createNamedParameter($exclude_ctypes, Connection::PARAM_STR_ARRAY))
- )
+ $queryBuilder->expr()->or($queryBuilder->expr()->and(
+ $queryBuilder->expr()->neq('tt_content.list_type', $queryBuilder->createNamedParameter('')),
+ $queryBuilder->expr()->neq('tt_content.list_type', $queryBuilder->createNamedParameter('0'))
+ ),
+ $queryBuilder->expr()->notIn('tt_content.CType', $queryBuilder->createNamedParameter($exclude_ctypes, Connection::PARAM_STR_ARRAY)))
]);
}
@@ -231,7 +232,7 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
if ($my_value == 'gridelements_pi1' && $my_type == 2) {
// wir suchen auch in tx_gridelements_backend_layout
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->like('tt_content.pi_flexform', $queryBuilder->createNamedParameter("%" . $queryBuilder->escapeLikeWildcards($my_flexform) . "%")),
$queryBuilder->expr()->like('tt_content.tx_gridelements_backend_layout', $queryBuilder->createNamedParameter($queryBuilder->escapeLikeWildcards($my_flexform)))
)
@@ -244,16 +245,16 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
}
$asc = ($my_direction == 1) ? 'DESC' : 'ASC';
- switch ($my_orderby) {
- case 1: $sort = 'tt_content.uid'; break;
- case 2: $sort = 'tt_content.sys_language_uid'; break;
- case 3: $sort = 'tt_content.colPos'; break;
- case 4: $sort = 'tt_content.header'; break;
- case 5: $sort = 'tt_content.CType'; break;
- case 6: $sort = 'tt_content.list_type'; break;
- case 7: $sort = 'pages.title'; break;
- default: $sort = 'tt_content.pid';
- }
+ $sort = match ($my_orderby) {
+ 1 => 'tt_content.uid',
+ 2 => 'tt_content.sys_language_uid',
+ 3 => 'tt_content.colPos',
+ 4 => 'tt_content.header',
+ 5 => 'tt_content.CType',
+ 6 => 'tt_content.list_type',
+ 7 => 'pages.title',
+ default => 'tt_content.pid',
+ };
if ($my_orderby == 0) {
$res -> orderBy($sort, $asc) -> addOrderBy('tt_content.sorting');
} else {
@@ -267,18 +268,18 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
$subject = $row['pi_flexform'];
if ($subject) {
$pattern = '/([\n|\r|\t| ]*)(.*)([\n|\r|\t| ]*)(.*) 0) {
$row['actions'] = $sections . ' cols';
}
@@ -303,20 +304,20 @@ public function getPagesWithExtensions($my_c, $my_p, $my_type, $my_value, $my_fl
} else {
$row['domain'] = $this->getDomain($row['pid'], $row['sys_language_uid']);
}
- $row['csvheader'] = str_replace('"', '\'', $row['header']);
- $row['csvtitle'] = str_replace('"', '\'', $row['title']);
+ $row['csvheader'] = str_replace('"', '\'', (string) $row['header']);
+ $row['csvtitle'] = str_replace('"', '\'', (string) $row['title']);
if (isset($row['tx_gridelements_backend_layout'])) {
$row['misc'] = $row['tx_gridelements_backend_layout'];
if ($row['misc']=='2cols' || $row['misc']=='3cols' || $row['misc']=='4cols' || $row['misc']=='6cols') {
$pattern = '/([\n|\r|\t| ]*)(.*)([\n|\r|\t| ]*)(.*)removeAll();
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tt_content.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tt_content.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -384,11 +385,11 @@ public function getLatestContentElements($my_c, $my_p, $tstamp) {
}
if ($my_p==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->gt('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->andX(
+ $queryBuilder->expr()->and(
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -399,7 +400,7 @@ public function getLatestContentElements($my_c, $my_p, $tstamp) {
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -429,8 +430,8 @@ public function getLatestContentElements($my_c, $my_p, $tstamp) {
} else {
$row['domain'] = $this->getDomain($row['pid'], $row['sys_language_uid']);
}
- $row['csvheader'] = str_replace('"', '\'', $row['header']);
- $row['csvtitle'] = str_replace('"', '\'', $row['title']);
+ $row['csvheader'] = str_replace('"', '\'', (string) $row['header']);
+ $row['csvtitle'] = str_replace('"', '\'', (string) $row['title']);
$pages[] = $row;
}
return $pages;
@@ -477,16 +478,13 @@ public function getLayouts($my_value, $my_p) {
)
)
->orWhere(
- $queryBuilder->expr()->andX(
- $queryBuilder->expr()->neq(
- 'backend_layout_next_level',
- $queryBuilder->createNamedParameter('')
- ),
- $queryBuilder->expr()->neq(
- 'backend_layout_next_level',
- $queryBuilder->createNamedParameter('0')
- )
- )
+ $queryBuilder->expr()->and($queryBuilder->expr()->neq(
+ 'backend_layout_next_level',
+ $queryBuilder->createNamedParameter('')
+ ), $queryBuilder->expr()->neq(
+ 'backend_layout_next_level',
+ $queryBuilder->createNamedParameter('0')
+ ))
);
}
// Restricions
@@ -495,11 +493,11 @@ public function getLayouts($my_value, $my_p) {
->removeAll();
if ($my_p==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->gt('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->andX(
+ $queryBuilder->expr()->and(
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -510,7 +508,7 @@ public function getLayouts($my_value, $my_p) {
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -534,7 +532,7 @@ public function getLayouts($my_value, $my_p) {
$row['domain'] = $this->getDomain($row['pid'], $row['sys_language_uid']);
}
$row['csvheader'] = '';
- $row['csvtitle'] = str_replace('"', '\'', $row['title']);
+ $row['csvtitle'] = str_replace('"', '\'', (string) $row['title']);
$pages[] = $row;
}
return $pages;
@@ -569,11 +567,11 @@ public function getLatestPages($my_p, $tstamp) {
->removeAll();
if ($my_p==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->gt('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->andX(
+ $queryBuilder->expr()->and(
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -584,7 +582,7 @@ public function getLatestPages($my_p, $tstamp) {
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -610,7 +608,7 @@ public function getLatestPages($my_p, $tstamp) {
$row['domain'] = $this->getDomain($row['pid'], $row['sys_language_uid']);
}
$row['csvheader'] = '';
- $row['csvtitle'] = str_replace('"', '\'', $row['title']);
+ $row['csvtitle'] = str_replace('"', '\'', (string) $row['title']);
$pages[] = $row;
}
return $pages;
@@ -640,7 +638,7 @@ function getPageLinks($my_c, $my_p, $linkto_uid)
$queryBuilder->expr()->eq('tablenames', $queryBuilder->createNamedParameter('tt_content'))
);
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('link', $queryBuilder->createNamedParameter("t3://page?uid=" . $linkto_uid)),
$queryBuilder->expr()->like('link', $queryBuilder->createNamedParameter("t3://page?uid=" . $linkto_uid . " %"))
)
@@ -683,7 +681,7 @@ function getPageLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tt_content.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tt_content.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -696,11 +694,11 @@ function getPageLinks($my_c, $my_p, $linkto_uid)
}
if ($my_p==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->gt('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->andX(
+ $queryBuilder->expr()->and(
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -711,7 +709,7 @@ function getPageLinks($my_c, $my_p, $linkto_uid)
$queryBuilder->expr()->eq('pages.deleted', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->eq('pages.hidden', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->lte('pages.starttime', $queryBuilder->createNamedParameter(time())),
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('pages.endtime', $queryBuilder->createNamedParameter(0)),
$queryBuilder->expr()->gt('pages.endtime', $queryBuilder->createNamedParameter(time()))
)
@@ -720,7 +718,7 @@ function getPageLinks($my_c, $my_p, $linkto_uid)
// Das Haupt-Where
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->like('tt_content.bodytext', $queryBuilder->createNamedParameter('%"t3://page?uid=' . $linkto_uid . '"%')),
$queryBuilder->expr()->eq('tt_content.header_link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('tt_content.header_link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %')),
@@ -787,7 +785,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1))
)
@@ -799,7 +797,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
]);
}
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->like('bodytext', $queryBuilder->createNamedParameter('%"t3://page?uid=' . $linkto_uid . '"%')),
$queryBuilder->expr()->eq('internalurl', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('internalurl', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %'))
@@ -840,7 +838,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tx_news_domain_model_news.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tx_news_domain_model_news.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -852,7 +850,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
]);
}
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('ref.link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('ref.link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %'))
)
@@ -891,7 +889,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tx_news_domain_model_news.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tx_news_domain_model_news.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -904,7 +902,7 @@ function getNewsLinks($my_c, $my_p, $linkto_uid)
}
//$res -> andWhere("tx_news_domain_model_link.uri='t3://page?uid=".$linkto_uid."' OR tx_news_domain_model_link.uri LIKE 't3://page?uid=".$linkto_uid." %'");
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tx_news_domain_model_link.uri', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('tx_news_domain_model_link.uri', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %'))
)
@@ -951,7 +949,7 @@ function getCamaligaLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1))
)
@@ -963,7 +961,7 @@ function getCamaligaLinks($my_c, $my_p, $linkto_uid)
]);
}
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->like('longdesc', $queryBuilder->createNamedParameter('%"t3://page?uid=' . $linkto_uid . '"%')),
$queryBuilder->expr()->eq('link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %'))
@@ -1004,7 +1002,7 @@ function getCamaligaLinks($my_c, $my_p, $linkto_uid)
if ($my_c==1) {
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('tx_camaliga_domain_model_content.deleted', $queryBuilder->createNamedParameter(1)),
$queryBuilder->expr()->eq('tx_camaliga_domain_model_content.hidden', $queryBuilder->createNamedParameter(1))
)
@@ -1016,7 +1014,7 @@ function getCamaligaLinks($my_c, $my_p, $linkto_uid)
]);
}
$res -> andWhere(...[
- $queryBuilder->expr()->orX(
+ $queryBuilder->expr()->or(
$queryBuilder->expr()->eq('ref.link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid)),
$queryBuilder->expr()->like('ref.link', $queryBuilder->createNamedParameter('t3://page?uid=' . $linkto_uid . ' %'))
)
@@ -1411,11 +1409,11 @@ protected function getDomain($uid, $sys_language_uid = 0)
if ($sys_language_uid == -1) {
$sys_language_uid = 0;
}
- $rootLineUtility = new \TYPO3\CMS\Core\Utility\RootlineUtility($uid);
+ $rootLineUtility = new RootlineUtility($uid);
try {
$rootline = $rootLineUtility->get();
$root = array_pop($rootline);
- } catch (\Exception $e) {
+ } catch (\Exception) {
return '';
}
if (isset($root['is_siteroot'])) {
@@ -1424,22 +1422,22 @@ protected function getDomain($uid, $sys_language_uid = 0)
$base = $site->getConfiguration()['base'];
$lang = $site->getConfiguration()['languages'];
$lang = $lang[$sys_language_uid]['base'];
- if ((substr($base, 0, 4) == 'http') && (substr($lang, 0, 4) == 'http')) {
+ if ((str_starts_with((string) $base, 'http')) && (str_starts_with((string) $lang, 'http'))) {
// wenn die Domain beides mal benutzt wird, entfernen wir sie bei der Sprache
- $parse_url = parse_url($lang);
+ $parse_url = parse_url((string) $lang);
$lang = $parse_url['path'];
}
- $domain = rtrim($base, '/') . rtrim($lang, '/');
- if ((substr($base, 0, 4) != 'http') && (strlen($base) > 4)) {
- if (substr($base, 0, 2) == '//') {
+ $domain = rtrim((string) $base, '/') . rtrim((string) $lang, '/');
+ if ((!str_starts_with((string) $base, 'http')) && (strlen((string) $base) > 4)) {
+ if (str_starts_with((string) $base, '//')) {
// muss nicht sein: $domain = 'http:' . $domain;
- } else if (substr($base, 0, 1) == '/') {
+ } else if (str_starts_with((string) $base, '/')) {
$domain = 'http:/' . $domain;
} else {
$domain = 'http://' . $domain;
}
}
- } catch (\Exception $e) {
+ } catch (\Exception) {
return '';
}
}
@@ -1481,7 +1479,7 @@ public function filterPagesRecursive($pages, $uid)
*/
public function isInRootLine($uid, $searchUid)
{
- $rootLineUtility = new \TYPO3\CMS\Core\Utility\RootlineUtility($uid);
+ $rootLineUtility = new RootlineUtility($uid);
$rootline = $rootLineUtility->get();
foreach ($rootline as $page) {
if ($page['uid'] == $searchUid) {
@@ -1588,7 +1586,7 @@ public function getRecordRow($tableName, $uid, $filter = '')
case 'deleted':
$queryBuilder->getRestrictions()
->removeAll()
- ->add(GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction::class));
+ ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
break;
default:
$queryBuilder->getRestrictions()->removeAll();
diff --git a/Classes/ViewHelpers/EditLinkViewHelper.php b/Classes/ViewHelpers/EditLinkViewHelper.php
index d287963..d005a59 100644
--- a/Classes/ViewHelpers/EditLinkViewHelper.php
+++ b/Classes/ViewHelpers/EditLinkViewHelper.php
@@ -1,9 +1,11 @@
arguments['language'];
}
$urlParameters['returnUrl'] = GeneralUtility::getIndpEnv('REQUEST_URI');
- $uriBuilder = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Routing\UriBuilder');
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uri = $uriBuilder->buildUriFromRoute('record_edit', $urlParameters);
// $uri = \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('record_edit', $urlParameters);
// das hier funktioniert überhaupt nicht:
diff --git a/Classes/Widgets/Provider/ContentDataProvider.php b/Classes/Widgets/Provider/ContentDataProvider.php
index a2d7315..8091b5b 100644
--- a/Classes/Widgets/Provider/ContentDataProvider.php
+++ b/Classes/Widgets/Provider/ContentDataProvider.php
@@ -45,15 +45,9 @@ protected function getNumberOfContents(int $mode = 0): int
->getRestrictions()
->removeAll();
if (!$mode) {
- $expression = $queryBuilder->expr()->andX(
- $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0))
- );
+ $expression = $queryBuilder->expr()->and($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0)));
} elseif ($mode == 2) {
- $expression = $queryBuilder->expr()->andX(
- $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1))
- );
+ $expression = $queryBuilder->expr()->and($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1)));
} elseif ($mode == 3) {
$expression = $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(1));
}
diff --git a/Classes/Widgets/Provider/NumberOfExtensionsDataProvider.php b/Classes/Widgets/Provider/NumberOfExtensionsDataProvider.php
index 4d4bce4..67ac0e0 100644
--- a/Classes/Widgets/Provider/NumberOfExtensionsDataProvider.php
+++ b/Classes/Widgets/Provider/NumberOfExtensionsDataProvider.php
@@ -4,13 +4,14 @@
namespace Fixpunkt\Backendtools\Widgets\Provider;
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Dashboard\Widgets\NumberWithIconDataProviderInterface;
class NumberOfExtensionsDataProvider implements NumberWithIconDataProviderInterface
{
public function getNumber(int $secondsBack = 86400): int
{
- $dir = \TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/typo3conf/ext/*';
+ $dir = Environment::getPublicPath() . '/typo3conf/ext/*';
return count(array_filter(glob($dir), "is_dir"));
}
diff --git a/Classes/Widgets/Provider/PagesDataProvider.php b/Classes/Widgets/Provider/PagesDataProvider.php
index 9488ca2..fd833a4 100644
--- a/Classes/Widgets/Provider/PagesDataProvider.php
+++ b/Classes/Widgets/Provider/PagesDataProvider.php
@@ -47,22 +47,11 @@ protected function getNumberOfPages(int $mode = 0): int
->getRestrictions()
->removeAll();
if (!$mode) {
- $expression = $queryBuilder->expr()->andX(
- $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('nav_hide', $queryBuilder->createNamedParameter(0))
- );
+ $expression = $queryBuilder->expr()->and($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('nav_hide', $queryBuilder->createNamedParameter(0)));
} elseif ($mode == 1) {
- $expression = $queryBuilder->expr()->andX(
- $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('nav_hide', $queryBuilder->createNamedParameter(1))
- );
+ $expression = $queryBuilder->expr()->and($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('nav_hide', $queryBuilder->createNamedParameter(1)));
} elseif ($mode == 2) {
- $expression = $queryBuilder->expr()->andX(
- $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)),
- $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1))
- );
+ $expression = $queryBuilder->expr()->and($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(0)), $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(1)));
} elseif ($mode == 3) {
$expression = $queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(1));
}
diff --git a/Configuration/TCA/tx_backendtools_domain_model_session.php b/Configuration/TCA/tx_backendtools_domain_model_session.php
index f282dee..1723d6f 100644
--- a/Configuration/TCA/tx_backendtools_domain_model_session.php
+++ b/Configuration/TCA/tx_backendtools_domain_model_session.php
@@ -5,7 +5,6 @@
'label' => 'action',
'tstamp' => 'tstamp',
'crdate' => 'crdate',
- 'cruser_id' => 'cruser_id',
'enablecolumns' => [
],
'security' => [
@@ -25,34 +24,32 @@
'config' => [
'type' => 'input',
'size' => 30,
- 'eval' => 'trim,required'
+ 'eval' => 'trim',
+ 'required' => true
],
],
'value1' => [
'exclude' => false,
'label' => 'LLL:EXT:backendtools/Resources/Private/Language/locallang_db.xlf:tx_backendtools_domain_model_session.value1',
'config' => [
- 'type' => 'input',
- 'size' => 4,
- 'eval' => 'int'
+ 'type' => 'number',
+ 'size' => 4
]
],
'value2' => [
'exclude' => false,
'label' => 'LLL:EXT:backendtools/Resources/Private/Language/locallang_db.xlf:tx_backendtools_domain_model_session.value2',
'config' => [
- 'type' => 'input',
- 'size' => 4,
- 'eval' => 'int'
+ 'type' => 'number',
+ 'size' => 4
]
],
'value3' => [
'exclude' => false,
'label' => 'LLL:EXT:backendtools/Resources/Private/Language/locallang_db.xlf:tx_backendtools_domain_model_session.value3',
'config' => [
- 'type' => 'input',
- 'size' => 4,
- 'eval' => 'int'
+ 'type' => 'number',
+ 'size' => 4
]
],
'value4' => [
@@ -86,18 +83,16 @@
'exclude' => false,
'label' => 'LLL:EXT:backendtools/Resources/Private/Language/locallang_db.xlf:tx_backendtools_domain_model_session.pageel',
'config' => [
- 'type' => 'input',
- 'size' => 4,
- 'eval' => 'int'
+ 'type' => 'number',
+ 'size' => 4
],
],
'pagestart' => [
'exclude' => false,
'label' => 'LLL:EXT:backendtools/Resources/Private/Language/locallang_db.xlf:tx_backendtools_domain_model_session.pagestart',
'config' => [
- 'type' => 'input',
- 'size' => 4,
- 'eval' => 'int'
+ 'type' => 'number',
+ 'size' => 4
],
],
'beuser' => [
diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.typoscript
similarity index 100%
rename from Configuration/TypoScript/constants.txt
rename to Configuration/TypoScript/constants.typoscript
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.typoscript
similarity index 100%
rename from Configuration/TypoScript/setup.txt
rename to Configuration/TypoScript/setup.typoscript
diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
index 8cae7a4..4853714 100644
--- a/Documentation/Changelog/Index.rst
+++ b/Documentation/Changelog/Index.rst
@@ -10,6 +10,10 @@
Changelog
=========
+Version 5.2.0:
+Refactored with the rector-tool.
+setup.txt and constants.txt renamed to .typoscript.
+
Version 5.1.0/2:
New tool: show where missing files are used.
Bugfix: show meta-data again in "Show images without title- or alt-text".
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 74d3d2c..789a1ca 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -4,7 +4,7 @@
# ... (required) title (displayed in left sidebar (desktop) or top panel (mobile)
# .................................................................................
-project = TYPO3 backendtools (9 admin tools): extension-list, recent pages, pages with layouts, linklist, redirects import, file-deletion, missing images and images with no alt or title.
+project = TYPO3 backendtools (9 admin tools)
# .................................................................................
# ... (recommended) version, displayed next to title (desktop) and in
*/
-class SessionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
+class SessionControllerTest extends UnitTestCase
{
/**
- * @var \Fixpunkt\Backendtools\Controller\SessionController
- */
- protected $subject = NULL;
+ * @var SessionController
+ */
+ protected $subject = NULL;
public function setUp()
{
- $this->subject = $this->getMock('Fixpunkt\\Backendtools\\Controller\\SessionController', array('redirect', 'forward', 'addFlashMessage'), array(), '', FALSE);
+ $this->subject = $this->getMock(SessionController::class, ['redirect', 'forward', 'addFlashMessage'], [], '', FALSE);
}
public function tearDown()
@@ -53,9 +56,9 @@ public function tearDown()
public function listActionFetchesAllSessionsFromRepositoryAndAssignsThemToView()
{
- $allSessions = $this->getMock('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', array(), array(), '', FALSE);
+ $allSessions = $this->getMock(ObjectStorage::class, [], [], '', FALSE);
- $sessionRepository = $this->getMock('', array('findAll'), array(), '', FALSE);
+ $sessionRepository = $this->getMock('', ['findAll'], [], '', FALSE);
$sessionRepository->expects($this->once())->method('findAll')->will($this->returnValue($allSessions));
$this->inject($this->subject, 'sessionRepository', $sessionRepository);
diff --git a/Tests/Unit/Domain/Model/SessionTest.php b/Tests/Unit/Domain/Model/SessionTest.php
index a4d9e06..cbb04b2 100644
--- a/Tests/Unit/Domain/Model/SessionTest.php
+++ b/Tests/Unit/Domain/Model/SessionTest.php
@@ -2,6 +2,8 @@
namespace Fixpunkt\Backendtools\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Core\Tests\UnitTestCase;
+use Fixpunkt\Backendtools\Domain\Model\Session;
/***************************************************************
* Copyright notice
*
@@ -25,7 +27,6 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* Test case for class \Fixpunkt\Backendtools\Domain\Model\Session.
*
@@ -34,16 +35,16 @@
*
* @author Kurt Gusbeth
*/
-class SessionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
+class SessionTest extends UnitTestCase
{
/**
- * @var \Fixpunkt\Backendtools\Domain\Model\Session
- */
- protected $subject = NULL;
+ * @var Session
+ */
+ protected $subject = NULL;
public function setUp()
{
- $this->subject = new \Fixpunkt\Backendtools\Domain\Model\Session();
+ $this->subject = new Session();
}
public function tearDown()
diff --git a/composer.json b/composer.json
index cec84ef..c90b73a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"name" : "fixpunkt/backendtools",
"type" : "typo3-cms-extension",
- "description" : "8 admin tools for extension listing, recent pages, pages with layouts, redirects, unused files, images with no alt- or title-tag and links.",
+ "description" : "9 admin tools for extension listing, recent pages, pages with layouts, redirects, unused files, images with no alt- or title-tag and links.",
"authors" : [{
"name" : "Kurt Gusbeth",
"role" : "Developer"
diff --git a/ext_emconf.php b/ext_emconf.php
index 14e7b9e..18d04b2 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -10,19 +10,17 @@
* writing. "version" and "dependencies" must not be touched!
***************************************************************/
-$EM_CONF[$_EXTKEY] = array (
+$EM_CONF[$_EXTKEY] = [
'title' => 'Backend tools',
'description' => '9 admin tools: extension-list, recent pages & elements, backend layouts, redirects import & check, file-deletion, missing files, images with no alt or title and link-list.',
'category' => 'module',
'author' => 'Kurt Gusbeth',
'author_company' => 'fixpunkt für digitales GmbH',
'state' => 'stable',
- 'createDirs' => '',
- 'clearCacheOnLoad' => false,
- 'version' => '5.1.2',
- 'constraints' => array (
- 'depends' => array (
+ 'version' => '5.2.0',
+ 'constraints' => [
+ 'depends' => [
'typo3' => '12.4.0-12.4.99',
- ),
- ),
-);
\ No newline at end of file
+ ]
+ ]
+];
\ No newline at end of file