Merge pull request #29 from b13/task/v12

[!!!][TASK] change dependencies

Author: achimfritz

Classes/Command/MigrateFieldsCommand.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 namespace B13\Masi\Command;
 
 /*
@@ -14,8 +15,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use TYPO3\CMS\Core\Core\ClassLoadingInformation;
-use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;

Classes/SlugModifier.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 namespace B13\Masi;
 
 /*
@@ -11,6 +12,7 @@
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\SlugHelper;
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -20,50 +22,23 @@
  */
 class SlugModifier
 {
-    /**
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * @var string
-     */
-    protected $fieldName;
-
-    /**
-     * @var int
-     */
-    protected $workspaceId;
-
-    /**
-     * @var array
-     */
-    protected $configuration;
+    protected string $tableName;
+    protected string $fieldName;
+    protected int $workspaceId;
+    protected array $configuration;
 
     /**
      * Defines whether the slug field should start with "/".
      * For pages (due to rootline functionality), this is a must have, otherwise the root level page
      * would have an empty value.
-     *
-     * @var bool
      */
-    protected $prependSlashInSlug;
+    protected bool $prependSlashInSlug;
 
-    /**
-     * @var int
-     */
-    protected $pid;
-    /**
-     * @var array
-     */
-    protected $recordData;
+    protected int $pid;
+    protected array $recordData;
 
     /**
      * Hooks into after a page URL was generated.
-     *
-     * @param array $parameters
-     * @param SlugHelper $helper
-     * @return string
      */
     public function modifyGeneratedSlugForPage(array $parameters, SlugHelper $helper): string
     {
@@ -80,15 +55,8 @@ public function modifyGeneratedSlugForPage(array $parameters, SlugHelper $helper
 
     /**
      * Take over hook values to our own class.
-     *
-     * @param array $configuration
-     * @param $tableName
-     * @param $fieldName
-     * @param $pid
-     * @param $workspaceId
-     * @param $record
      */
-    protected function resolveHookParameters(array $configuration, $tableName, $fieldName, $pid, $workspaceId, $record)
+    protected function resolveHookParameters(array $configuration, string $tableName, string $fieldName, int $pid, int $workspaceId, array $record): void
     {
         $overrides = BackendUtility::getPagesTSconfig($pid)['TCEMAIN.'][$tableName . '.'][$fieldName . '.'] ?? [];
         if ($overrides) {
@@ -108,6 +76,17 @@ protected function resolveHookParameters(array $configuration, $tableName, $fiel
         $this->pid = $pid;
         $this->workspaceId = $workspaceId;
         $this->recordData = $record;
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
+        $row = $queryBuilder->select('*')
+            ->from('pages')
+            ->where(
+                $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($record['uid'], \PDO::PARAM_INT))
+            )
+            ->execute()
+            ->fetchAssociative();
+        if ($row !== false) {
+            $this->recordData = $row;
+        }
 
         if ($tableName === 'pages' && $fieldName === 'slug') {
             $this->prependSlashInSlug = true;
@@ -118,9 +97,6 @@ protected function resolveHookParameters(array $configuration, $tableName, $fiel
 
     /**
      * Re-creates the slug like core, however, uses our custom "resolveParentPageRecord" method.
-     *
-     * @param SlugHelper $helper
-     * @return string
      */
     protected function regenerateSlug(SlugHelper $helper): string
     {
@@ -168,7 +144,7 @@ protected function regenerateSlug(SlugHelper $helper): string
         $slug = $helper->sanitize($slug);
         // No valid data found
         if ($slug === '' || $slug === '/') {
-            $slug = 'default-' . GeneralUtility::shortMD5(json_encode($this->recordData));
+            $slug = 'default-' . substr(md5(json_encode($this->recordData)), 0, 10);
         }
         if ($this->prependSlashInSlug && ($slug[0] ?? '') !== '/') {
             $slug = '/' . $slug;
@@ -183,14 +159,9 @@ protected function regenerateSlug(SlugHelper $helper): string
     /**
      * Similar to core logic, but a bit different:
      * Fetches the parent page, but only respects recyclers! includes sysfolders
-     *
-     * @param int $pid
-     * @param int $languageId
-     * @return array|null
      */
     protected function resolveParentPageRecord(int $pid, int $languageId): ?array
     {
-        $parentPageRecord = null;
         $rootLine = BackendUtility::BEgetRootLine($pid, '', true, ['nav_title', 'exclude_slug_for_subpages']);
         do {
             $parentPageRecord = array_shift($rootLine) ?? [];
@@ -202,10 +173,6 @@ protected function resolveParentPageRecord(int $pid, int $languageId): ?array
 
     /**
      * Fetches a record translation if there is one and returns that one instead.
-     *
-     * @param array $page
-     * @param int $languageId
-     * @return array
      */
     protected function tryRecordOverlay(array $page, int $languageId): array
     {

Classes/Updates/MigrateRealUrlExcludeField.php

@@ -92,7 +92,7 @@ public function updateNecessary(): bool
     public function getPrerequisites(): array
     {
         return [
-            DatabaseUpdatedPrerequisite::class
+            DatabaseUpdatedPrerequisite::class,
         ];
     }
 }

Configuration/Commands.php

@@ -1,10 +1,9 @@
 <?php
-defined('TYPO3_MODE') or die();
 
+defined('TYPO3') or die();
 
 $GLOBALS['TCA']['pages']['columns']['slug']['config']['generatorOptions']['postModifiers'][] = \B13\Masi\SlugModifier::class . '->modifyGeneratedSlugForPage';
 
-
 $additionalColumns = [
     'exclude_slug_for_subpages' => [
         'exclude' => true,
@@ -16,16 +15,15 @@
                 [
                     0 => '',
                     1 => '',
-                ]
+                ],
             ],
             'behaviour' => [
-                'allowLanguageSynchronization' => true
-            ]
-        ]
-    ]
+                'allowLanguageSynchronization' => true,
+            ],
+        ],
+    ],
 ];
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $additionalColumns);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('pages', 'title', 'exclude_slug_for_subpages', 'after:slug');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('pages', 'titleonly', 'exclude_slug_for_subpages', 'after:slug');
-

Configuration/TCA/Overrides/pages.php

@@ -1,10 +1,10 @@
 # masi - Extend TYPO3's URL Handling
 
-Masi is the missing piece for the people who want to customize _everything_ when generating URLs in TYPO3 v9+.
+Masi is the missing piece for the people who want to customize _everything_ when generating URLs in TYPO3 v10+.
 
 ## Features
 
-1. TYPO3 v9 skips pages of type "SysFolder" and "Spacers" by default when generating the URL of subpages. _masi_ includes them by default!
+1. TYPO3 v10 skips pages of type "SysFolder" and "Spacers" by default when generating the URL of subpages. _masi_ includes them by default!
 
 2. _masi_ also ships with a new checkbox for pages, to exclude a certain page slug when generating subpages. This way, you can exclude only certain SysFolders.
 
@@ -36,7 +36,7 @@ Of course, all the values within the "slug" field can be changed by the editor,
 
 Use it via `composer req b13/masi` or install the Extension `masi` from the TYPO3 Extension Repository.
 
-_masi_ requires TYPO3 v9.5.6 or later.
+_masi_ requires TYPO3 v10.4.0 or later.
 
 If you want to migrate from RealURL, execute this one-time command as long as the database field `pages.tx_realurl_exclude` exists, and transfers the data to `pages.exclude_slug_for_subpages`:
 
@@ -51,7 +51,7 @@ As TYPO3 Core, _masi_ is licensed under GPL2 or later. See the LICENSE file for
 
 ## Background, Authors & Further Maintenance
 
-This extension was created as a show-case on what you can do with one magic hook for TYPO3 v9 and customize
+This extension was created as a show-case on what you can do with one magic hook for TYPO3 v10 and customize
 so many things.
 
 TYPO3 community often requests functionality, which can be put in small and efficient extensions, and _masi_ does

README.md

@@ -13,7 +13,8 @@
   "homepage": "https://github.com/b13/masi",
   "license": ["GPL-2.0-or-later"],
   "require": {
-    "typo3/cms-core": "^9.5.6 || ^10.0 || ^11.0"
+    "php": "^7.4 || ~8.0",
+    "typo3/cms-core": "^10.4 || ^11.5 || ^12.0"
   },
   "replace": {
     "typo3-ter/masi": "self.version"

composer.json

@@ -1,4 +1,5 @@
 <?php
+
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Masi - customize your Page URLs',
     'description' => 'Adds convenient features for excluding pages when generating URLs.',
@@ -7,10 +8,10 @@
     'author' => 'Benni Mack',
     'author_email' => 'benjamin.mack@b13.com',
     'author_company' => 'b13 GmbH',
-    'version' => '1.2.2',
+    'version' => '2.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.0-11.5.99',
+            'typo3' => '10.4.0-12.99.99',
         ],
     ],
 ];

ext_emconf.php

@@ -1,5 +1,7 @@
 <?php
 
+defined('TYPO3') or die();
+
 /**
  * Registering Upgrade Wizards
  */