Version 5.2.0: refactoring

Classes/Domain/Model/BackendUser.php

@@ -29,8 +29,8 @@ class BackendUser extends AbstractEntity
 {
     /**
      * @var string
-     * @Extbase\Validate("NotEmpty")
      */
+    #[Extbase\Validate(['validator' => 'NotEmpty'])]
     protected $userName = '';
 
     /**

Classes/Domain/Model/Session.php

@@ -1,6 +1,7 @@
 <?php
 namespace Fixpunkt\Backendtools\Domain\Model;
 
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Annotation as Extbase;
 
 /***************************************************************
@@ -31,15 +32,15 @@
 /**
  * Session
  */
-class Session extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class Session extends AbstractEntity
 {
 
     /**
      * Key (action)
      *
-     * @Extbase\Validate("NotEmpty")
      * @var string
      */
+    #[Extbase\Validate(['validator' => '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;
     }

Classes/ViewHelpers/EditLinkViewHelper.php

@@ -1,9 +1,11 @@
 <?php
 namespace Fixpunkt\Backendtools\ViewHelpers;
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class EditLinkViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper {
+class EditLinkViewHelper extends AbstractTagBasedViewHelper {
 
 	/**
 	 * @var string
@@ -49,7 +51,7 @@ public function render()
             $urlParameters['overrideVals']['pages']['sys_language_uid'] = $this->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: 

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));
         }

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"));
     }
 

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));
         }

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' => [

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".

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 <meta name="book-version"

README.md

@@ -1,6 +1,6 @@
 # backendtools
 
-version 5.1.2
+version 5.2.0
 
 9 admin tools for extensions, pages, (backend) layouts, slug, redirects, files, images and links:
 extension-list, recent pages and content elements, used (backend) layouts, import redirects, check redirects, 
@@ -9,9 +9,13 @@ delete unused files, show where missing files are used, images with no title/alt
 You find the documentation for this extension at typo3.org:
 https://docs.typo3.org/p/fixpunkt/backendtools/master/en-us/
 
-Version 5.0.0
+Version 5.0.0:
 First version for TYPO3 12 LTS.
 
-Version 5.1.2
+Version 5.1.2:
 New tool: show where missing files are used.
-Bugfix: show meta-data again in "Show images without title- or alt-text". 
+Bugfix: show meta-data again in "Show images without title- or alt-text".
+
+Version 5.2.0:
+Refactored with the rector-tool.
+setup.txt and constants.txt renamed to .typoscript.

Tests/Unit/Controller/SessionControllerTest.php

@@ -1,5 +1,9 @@
 <?php
 namespace Fixpunkt\Backendtools\Tests\Unit\Controller;
+
+use TYPO3\CMS\Core\Tests\UnitTestCase;
+use Fixpunkt\Backendtools\Controller\SessionController;
+use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 /***************************************************************
  *  Copyright notice
  *
@@ -23,23 +27,22 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * Test case for class Fixpunkt\Backendtools\Controller\SessionController.
  *
  * @author Kurt Gusbeth <k.gusbeth@fixpunkt.com>
  */
-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);
 

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 <k.gusbeth@fixpunkt.com>
  */
-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()

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"

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',
-    ),
-  ),
-);
+    ]
+  ]
+];