Merge branch 'FriendsOfTYPO3:master' into master

BastianBalthasarBux · Feb 6, 2024 · bbb7cc2 · bbb7cc2
2 parents 554be14 + 95e1d6d
commit bbb7cc2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Classes/Command/GeocodeCommand.php b/Classes/Command/GeocodeCommand.php
@@ -43,7 +43,7 @@ protected function configure()
      * @inheritdoc
      * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->getGeocodeService($input->getArgument('key'))->calculateCoordinatesForAllRecordsInTable();
         return 0;

diff --git a/Classes/Hooks/Tca/Label.php b/Classes/Hooks/Tca/Label.php
@@ -12,7 +12,6 @@
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 
 /**
  * Dynamic label of the address record based on tsconfig
@@ -30,7 +29,12 @@ public function getAddressLabel(array &$params): void
             return;
         }
 
-        $row = BackendUtility::getRecord('tt_address', (int) $params['row']['uid']);
+        if (is_numeric($params['row']['uid'])) {
+            $row = BackendUtility::getRecord('tt_address', (int) $params['row']['uid']);
+        } else {
+            $row = $params['row'];
+        }
+
         $configuration = $this->getConfiguration((int) $row['pid']);
         if (!$configuration) {
             return;

diff --git a/ext_conf_template.txt b/ext_conf_template.txt
@@ -5,4 +5,10 @@ backwardsCompatFormat = %1$s %3$s
 storeBackwardsCompatName = 1
 
   # cat=basic; type=boolean; label=Name field is read only
-readOnlyNameField = 1
+readOnlyNameField = 1
+
+  # cat=backend; type=text; label=Pattern for validation telephone number in TCA with PHP
+telephoneValidationPatternForPhp = /[^\d\+\s\-]/
+
+  # cat=backend; type=text; label=Pattern for validation telephone number in TCA with JS
+telephoneValidationPatternForJs = /[^\d\+\s\-]/g