Mise à jour sav_library_plus

YolfTypo3 · Oct 5, 2023 · 0ae7aaa · 0ae7aaa
1 parent e667717
commit 0ae7aaa
Show file tree

Hide file tree

Showing 46 changed files with 301 additions and 275 deletions.
diff --git a/Classes/Compatibility/Database/DatabaseConnection.php b/Classes/Compatibility/Database/DatabaseConnection.php
@@ -1122,8 +1122,8 @@ protected function checkConnectionCharset()
                 ]);
                 throw new \RuntimeException('TYPO3 Fatal Error: Could not determine the value of the database session variable: ' . $variableName, 1381847779);
             }
-
-            if ($charsetVariables[$variableName] !== $this->connectionCharset) {
+            if (! preg_match('/^' . $this->connectionCharset . '/', $charsetVariables[$variableName])) {
+//            if ($charsetVariables[$variableName] !== $this->connectionCharset) {
                 $hasValidCharset = false;
                 break;
             }
@@ -1192,7 +1192,11 @@ public function debug_check_recordset($res)
         }
         $trace = debug_backtrace(0);
         array_shift($trace);
-        $msg = 'Invalid database result detected: function TYPO3\\CMS\\Typo3DbLegacy\\Database\\DatabaseConnection->' . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(Environment::getPublicPath() . '/') + 2)) . ' in line ' . $trace[0]['line'] . '.';
+        $msg = 'Invalid database result detected: function TYPO3\\CMS\\Typo3DbLegacy\\Database\\DatabaseConnection->' . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(Environment::getPublicPath() . '/') + 2)) . ' in line ' . $trace[0]['line'] . '.' . chr(10);
+        for ($i=1; $i<10; $i++) {
+            array_shift($trace);
+            $msg .= 'function ' . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(Environment::getPublicPath() . '/') + 2)) . ' in line ' . $trace[0]['line'] . '.' . chr(10);
+        }
         self::getLogger()->log(LogLevel::ERROR, $msg . ' Use a devLog extension to get more details.', [
             'extension' => 'core'
         ]);

diff --git a/Classes/Compatibility/Storage/Typo3DbBackendCompatibility.php b/Classes/Compatibility/Storage/Typo3DbBackendCompatibility.php
@@ -94,7 +94,7 @@ public static function doLanguageAndWorkspaceOverlay(string $tableName, array $r
             if ($tableName === 'pages') {
                 $row = $pageRepository->getPageOverlay($row, self::getLanguageUid());
             } elseif (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField']) && $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] !== '') {
-                if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']], [
+                if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']] ?? null, [
                     - 1,
                     0
                 ])) {

diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
@@ -632,7 +632,7 @@ public static function compressParameters($parameters)
     public static function uncompressParameters($compressedString, $formName = null)
     {
         // Checks if there is a fragment in the link
-        $fragmentPosition = strpos($compressedString, '#');
+        $fragmentPosition = strpos($compressedString ?? '', '#');
         if ($fragmentPosition !== false) {
             $compressedString = substr($compressedString, 0, $fragmentPosition);
         }
@@ -736,15 +736,15 @@ public static function getExtensionWebPath($extension)
     public function buildLinkToPage($str, $formParameters, $cache = 0, $additionalParameters = [])
     {
         // Gets the page id
-        $pageId = $formParameters['pageId'];
+        $pageId = $formParameters['pageId'] ?? null;
         if (! empty($pageId)) {
             unset($formParameters['pageId']);
         } else {
             $pageId = $this->getPageId();
         }
 
         // Gets the form name
-        $formName = ($formParameters['formName'] ? $formParameters['formName'] : self::getFormName());
+        $formName = (($formParameters['formName'] ?? false) ? $formParameters['formName'] : self::getFormName());
 
         // Builds the form parameters
         $formParameters = array_merge([
@@ -766,19 +766,19 @@ public function buildLinkToPage($str, $formParameters, $cache = 0, $additionalPa
 
         // Adds the page Id as parameter
         $conf['parameter'] = $pageId;
-        if ($formParameters['target']) {
+        if ($formParameters['target'] ?? false) {
             $conf['target'] = $formParameters['target'];
             unset($formParameters['target']);
         }
 
         // Adds the linkAccessRestrictedPages attribute
-        if ($formParameters['linkAccessRestrictedPages']) {
+        if ($formParameters['linkAccessRestrictedPages'] ?? false) {
             $conf['linkAccessRestrictedPages'] = true;
             unset($formParameters['linkAccessRestrictedPages']);
         }
 
         // Adds the forceAbsoluteUrl attribute
-        if (isset($formParameters['forceAbsoluteUrl'])) {
+        if ($formParameters['forceAbsoluteUrl'] ?? false) {
             $conf['forceAbsoluteUrl'] = $formParameters['forceAbsoluteUrl'];
             unset($formParameters['forceAbsoluteUrl']);
             if (isset($formParameters['forceAbsoluteUrl.'])) {

diff --git a/Classes/DatePicker/DatePicker.php b/Classes/DatePicker/DatePicker.php
@@ -90,8 +90,8 @@ protected static function addCascadingStyleSheet()
         $extensionKey = AbstractController::LIBRARY_NAME;
         $key = self::KEY . '.';
         $extensionTypoScriptConfiguration = ExtensionConfigurationManager::getTypoScriptConfiguration();
-        $datePickerTypoScriptConfiguration = $extensionTypoScriptConfiguration[$key];
-        if (empty($datePickerTypoScriptConfiguration['stylesheet']) === false) {
+        $datePickerTypoScriptConfiguration = $extensionTypoScriptConfiguration[$key] ?? null;
+        if (! empty($datePickerTypoScriptConfiguration['stylesheet'] ?? null)) {
             // The style sheet is given by the extension TypoScript
             $cascadingStyleSheetAbsoluteFileName = GeneralUtility::getFileAbsFileName($datePickerTypoScriptConfiguration['stylesheet']);
             if (is_file($cascadingStyleSheetAbsoluteFileName)) {
@@ -104,8 +104,8 @@ protected static function addCascadingStyleSheet()
             }
         } else {
             $libraryTypoScriptConfiguration = LibraryConfigurationManager::getTypoScriptConfiguration();
-            $datePickerTypoScriptConfiguration = $libraryTypoScriptConfiguration[$key];
-            if (empty($datePickerTypoScriptConfiguration['stylesheet']) === false) {
+            $datePickerTypoScriptConfiguration = $libraryTypoScriptConfiguration[$key] ?? null;
+            if (! empty($datePickerTypoScriptConfiguration['stylesheet'] ?? null)) {
                 // The style sheet is given by the library TypoScript
                 $cascadingStyleSheetAbsoluteFileName = GeneralUtility::getFileAbsFileName($datePickerTypoScriptConfiguration['stylesheet']);
                 if (is_file($cascadingStyleSheetAbsoluteFileName)) {
@@ -148,13 +148,13 @@ protected static function getDatePickerFormat()
     {
         $key = self::KEY . '.';
         $extensionTypoScriptConfiguration = ExtensionConfigurationManager::getTypoScriptConfiguration();
-        $datePickerTypoScriptConfiguration = $extensionTypoScriptConfiguration[$key];
-        if (is_array($datePickerTypoScriptConfiguration['format.'])) {
+        $datePickerTypoScriptConfiguration = $extensionTypoScriptConfiguration[$key] ?? null;
+        if (is_array($datePickerTypoScriptConfiguration['format.'] ?? null)) {
             return $datePickerTypoScriptConfiguration['format.'];
         } else {
             $libraryTypoScriptConfiguration = LibraryConfigurationManager::getTypoScriptConfiguration();
-            $datePickerTypoScriptConfiguration = $libraryTypoScriptConfiguration[$key];
-            if (is_array($datePickerTypoScriptConfiguration['format.'])) {
+            $datePickerTypoScriptConfiguration = $libraryTypoScriptConfiguration[$key] ?? null;
+            if (is_array($datePickerTypoScriptConfiguration['format.'] ?? null)) {
                 return $datePickerTypoScriptConfiguration['format.'];
             }
         }

diff --git a/Classes/Form/Element/Help.php b/Classes/Form/Element/Help.php
@@ -49,7 +49,6 @@ public function render()
 
         $result = $this->initializeResultArray();
         $result['html'] = '<a target="_blank" href="' . $documentationUrl . '">' . $message . '</a>';
-
         return $result;
     }
 

diff --git a/Classes/ItemViewers/Edit/DateItemViewer.php b/Classes/ItemViewers/Edit/DateItemViewer.php
@@ -43,7 +43,8 @@ protected function renderItem()
         if ($this->getItemConfiguration('error')) {
             $value = $this->getItemConfiguration('value');
         } else {
-            $value = ($this->getItemConfiguration('value') ? strftime($format, $this->getItemConfiguration('value')) : ($this->getItemConfiguration('nodefault') ? '' : strftime($format)));
+            // @todo Replace deprecated strftime in php 8.1. Suppress warning in v11.
+            $value = ($this->getItemConfiguration('value') ? @strftime($format, $this->getItemConfiguration('value')) : ($this->getItemConfiguration('nodefault') ? '' : @strftime($format)));
         }
 
         $htmlArray[] = HtmlElements::htmlInputTextElement([

diff --git a/Classes/ItemViewers/Edit/DateTimeItemViewer.php b/Classes/ItemViewers/Edit/DateTimeItemViewer.php
@@ -43,7 +43,8 @@ protected function renderItem()
         if ($this->getItemConfiguration('error')) {
             $value = $this->getItemConfiguration('value');
         } else {
-            $value = ($this->getItemConfiguration('value') ? strftime($format, $this->getItemConfiguration('value')) : ($this->getItemConfiguration('nodefault') ? '' : strftime($format)));
+            // @todo Replace deprecated strftime in php 8.1. Suppress warning in v11.
+            $value = ($this->getItemConfiguration('value') ? @strftime($format, $this->getItemConfiguration('value')) : ($this->getItemConfiguration('nodefault') ? '' : @strftime($format)));
         }
 
         $htmlArray[] = HtmlElements::htmlInputTextElement([

diff --git a/Classes/ItemViewers/Edit/FilesItemViewer.php b/Classes/ItemViewers/Edit/FilesItemViewer.php
@@ -59,7 +59,7 @@ protected function renderItem()
         for ($counter = 0; $counter < $this->getItemConfiguration('maxitems'); $counter ++) {
 
             // Sets the file name
-            $fileName = ($fileNames[$counter] ? $fileNames[$counter] : '');
+            $fileName = (($fileNames[$counter] ?? false) ? $fileNames[$counter] : '');
             if ($fileName instanceof FileReference)  {
                 $fileName = $fileName->getIdentifier();
             }

diff --git a/Classes/ItemViewers/Edit/RelationOneToManyAsSelectorboxItemViewer.php b/Classes/ItemViewers/Edit/RelationOneToManyAsSelectorboxItemViewer.php
@@ -40,7 +40,7 @@ protected function renderItem()
         $labelSelect = $this->getItemConfiguration('labelselect');
         if (empty($labelSelect) === false) {
             // Checks if this label comes from an aliasSelect attribute
-            $aliasSelect = $this->getItemConfiguration('aliasselect');
+            $aliasSelect = $this->getItemConfiguration('aliasselect') ?? '';
             if (preg_match('/(?:AS|as) ' . $labelSelect . '/', $aliasSelect)) {
                 // Uses the alias
                 $label = $labelSelect;

diff --git a/Classes/ItemViewers/Edit/RichTextEditorItemViewer.php b/Classes/ItemViewers/Edit/RichTextEditorItemViewer.php
@@ -16,10 +16,10 @@
 namespace YolfTypo3\SavLibraryPlus\ItemViewers\Edit;
 
 use TYPO3\CMS\Backend\Form\NodeFactory;
-use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Configuration\Richtext;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 
 /**
  * Edit rich text editor item Viewer.
@@ -38,6 +38,8 @@ protected function renderItem()
     {
         $GLOBALS['BE_USER'] = GeneralUtility::makeInstance(BackendUserAuthentication::class);
         $GLOBALS['BE_USER']->uc['edit_RTE'] = true;
+        $GLOBALS['BE_USER']->user['lang'] = null;
+        $GLOBALS['LANG'] = null;
 
         $richtextConfigurationProvider = GeneralUtility::makeInstance(Richtext::class);
         $richtextConfiguration = $richtextConfigurationProvider->getConfiguration('', '', $this->getPageId(), '', [
@@ -49,24 +51,44 @@ protected function renderItem()
         $nodeFactory = GeneralUtility::makeInstance(NodeFactory::class);
         $formData = [
             'renderType' => 'text',
+            'fieldName' => $this->getItemConfiguration('itemName'),
+            'processedTca' => [
+                'columns' => [
+                    $this->getItemConfiguration('itemName') => [
+                        'config' => [
+                            'type' => 'text',
+                        ]
+                    ]
+                ]
+            ],
+            'databaseRow' => [
+                'uid' => ''
+            ],
+            'tableName' => '',
+            'defaultLanguageDiffRow' => [
+            ],
+            'recordTypeValue' => null,
+            'effectivePid' => null,
             'inlineStructure' => [],
             'row' => [
-                'pid' => $this->getPageId()
+                'pid' => $this->getPageId(),
             ],
             'parameterArray' => [
                 'fieldConf' => [
                     'config' => [
                         'cols' => $this->getItemConfiguration('cols'),
                         'rows' => $this->getItemConfiguration('rows'),
                         'enableRichtext' => true,
-                        'richtextConfiguration' => $richtextConfiguration
+                        'richtextConfiguration' => $richtextConfiguration,
+                        'richtextConfigurationName' => null,
                     ],
                     'defaultExtras' => 'richtext[]:rte_transform[mode=ts_css]'
                 ],
                 'itemFormElName' => $this->getItemConfiguration('itemName'),
                 'itemFormElValue' => html_entity_decode($this->getItemConfiguration('value'), ENT_QUOTES)
             ]
         ];
+
         $formResult = $nodeFactory->create($formData)->render();
 
         // Loads the ckeditor javascript file
@@ -117,4 +139,6 @@ protected function sanitizeFieldId(string $itemFormElementName): string
         $fieldId = (string)preg_replace('/[^a-zA-Z0-9_:.-]/', '_', $itemFormElementName);
         return htmlspecialchars((string)preg_replace('/^[^a-zA-Z]/', 'x', $fieldId));
     }
+
 }
+
diff --git a/Classes/ItemViewers/Edit/SelectorboxItemViewer.php b/Classes/ItemViewers/Edit/SelectorboxItemViewer.php
@@ -59,7 +59,7 @@ protected function renderItem()
                     HtmlElements::htmlAddAttributeIfNotNull('selected', $selected),
                     HtmlElements::htmlAddAttribute('value', $item[1])
                 ],
-                stripslashes(FlashMessages::translate($item[0]))
+                stripslashes(FlashMessages::translate($item[0]) ?? '')
             );
         }
 

diff --git a/Classes/ItemViewers/General/AbstractItemViewer.php b/Classes/ItemViewers/General/AbstractItemViewer.php
@@ -158,7 +158,7 @@ public function isEditItemViewer()
      */
     public function getItemConfiguration($key)
     {
-        return $this->itemConfiguration[$key];
+        return $this->itemConfiguration[$key] ?? null;
     }
 
     /**
@@ -688,7 +688,7 @@ protected function makeNewWindowLink($value)
             ->parseFieldTags($windowUrl);
 
         // Returns the message if the window url is not a file
-        if (is_file($windowUrl) === false) {
+        if (is_file($windowUrl ?? '') === false) {
             return $message;
         }
 
@@ -824,8 +824,8 @@ protected function makeDateFormat($timeStamp)
         if (empty($format) === true) {
             $format = ($this->getItemConfiguration('eval' . $special) == 'datetime' ? $this->getController()->getDefaultDateTimeFormat() : $this->getController()->getDefaultDateFormat());
         }
-
-        return strftime($format, (int) $timeStamp);
+        // @todo Replace deprecated strftime in php 8.1. Suppress warning in v11.
+        return @strftime($format, (int) $timeStamp);
     }
 
     /**

diff --git a/Classes/ItemViewers/General/CheckboxItemViewer.php b/Classes/ItemViewers/General/CheckboxItemViewer.php
@@ -97,8 +97,8 @@ protected function renderCheckedAsImage()
         $content = HtmlElements::htmlImgElement([
                 HtmlElements::htmlAddAttribute('class', 'checkboxSelected'),
                 HtmlElements::htmlAddAttribute('src', LibraryConfigurationManager::getIconPath($imageFileName)),
-            HtmlElements::htmlAddAttribute('title',FlashMessages::translate($imageTitleKey)),
-            HtmlElements::htmlAddAttribute('alt', FlashMessages::translate($imageTitleKey))
+                HtmlElements::htmlAddAttribute('title',FlashMessages::translate($imageTitleKey)),
+                HtmlElements::htmlAddAttribute('alt', FlashMessages::translate($imageTitleKey))
             ]
         );
 
@@ -146,8 +146,8 @@ protected function renderNotCheckedAsImage()
         $content = HtmlElements::htmlImgElement([
                 HtmlElements::htmlAddAttribute('class', 'checkboxNotSelected'),
                 HtmlElements::htmlAddAttribute('src', LibraryConfigurationManager::getIconPath($imageFileName)),
-            HtmlElements::htmlAddAttribute('title', FlashMessages::translate($imageTitleKey)),
-            HtmlElements::htmlAddAttribute('alt', FlashMessages::translate($imageTitleKey))
+                HtmlElements::htmlAddAttribute('title', FlashMessages::translate($imageTitleKey)),
+                HtmlElements::htmlAddAttribute('alt', FlashMessages::translate($imageTitleKey))
             ]
         );
 

diff --git a/Classes/ItemViewers/General/FilesItemViewer.php b/Classes/ItemViewers/General/FilesItemViewer.php
@@ -56,7 +56,7 @@ protected function renderItem()
             $fileNames = $fileRepository->findByRelation($this->getItemConfiguration('tableName'), $this->getItemConfiguration('fieldName'), $this->getItemConfiguration('uid'));
         } else {
             // For old style extension
-            $fileNames = explode(',', $this->getItemConfiguration('value'));
+            $fileNames = explode(',', $this->getItemConfiguration('value') ?? '');
         }
 
         foreach ($fileNames as $fileNameKey => $this->fileName) {

diff --git a/Classes/ItemViewers/General/GraphItemViewer.php b/Classes/ItemViewers/General/GraphItemViewer.php
@@ -21,7 +21,6 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use YolfTypo3\SavCharts\Controller\DefaultController;
 use YolfTypo3\SavCharts\XmlParser\XmlParser;
 use YolfTypo3\SavLibraryPlus\Controller\AbstractController;
@@ -71,8 +70,12 @@ protected function renderItem()
             } else {
                 $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);
             }
-            /** @var ContentObjectRenderer $contentObject */
-            $contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
+
+            // Gets the content object
+            $contentObject = $this->getController()
+            ->getExtensionConfigurationManager()
+            ->getExtensionContentObject();
+
             $configurationManager->setContentObject($contentObject);
             $configurationManager->setConfiguration([
                 'extensionName' => 'SavCharts',

diff --git a/Classes/ItemViewers/General/LinkItemViewer.php b/Classes/ItemViewers/General/LinkItemViewer.php
@@ -29,6 +29,8 @@ class LinkItemViewer extends AbstractItemViewer
      */
     protected function renderItem()
     {
+        $content = '';
+
         // Gets the value
         $value = $this->getItemConfiguration('value');
 

diff --git a/Classes/ItemViewers/General/RelationOneToManyAsSelectorboxItemViewer.php b/Classes/ItemViewers/General/RelationOneToManyAsSelectorboxItemViewer.php
@@ -36,7 +36,7 @@ protected function renderItem()
         $labelSelect = $this->getItemConfiguration('labelselect');
         if (empty($labelSelect) === false) {
             // Checks if this label comes from an aliasSelect attribute
-            $aliasSelect = $this->getItemConfiguration('aliasselect');
+            $aliasSelect = $this->getItemConfiguration('aliasselect') ?? '';
             if (preg_match('/(?:AS|as) ' . $labelSelect . '/', $aliasSelect)) {
                 // Uses the alias
                 $label = $labelSelect;
@@ -65,8 +65,8 @@ protected function renderItem()
         $rows = $querier->getRows();
 
         // Processes the row
-        $row = $rows[0];
-        $specialFields = str_replace(' ', '', $this->getItemConfiguration('specialfields'));
+        $row = $rows[0] ?? null;
+        $specialFields = str_replace(' ', '', $this->getItemConfiguration('specialfields') ?? '');
         if (! empty($row)) {
             // Injects the special markers
             $specialFieldsArray = explode(',', $specialFields);

diff --git a/Classes/ItemViewers/General/SelectorboxItemViewer.php b/Classes/ItemViewers/General/SelectorboxItemViewer.php
@@ -46,7 +46,7 @@ protected function renderItem()
 
         // Gets the selected element
         if ($itemFound === true) {
-            $content = stripslashes(FlashMessages::translate($item[0]));
+            $content = stripslashes(FlashMessages::translate($item[0]) ?? '');
         } else {
             return '';
         }