Merge pull request #94 from markusweigelt/update-typo12

[MAINTENANCE] Update TYPO3 12
slub · Feb 13, 2025 · 8bc3da3 · 8bc3da3
2 parents 124ea2c + 0986ca7
commit 8bc3da3
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 46 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -17,7 +17,7 @@ jobs:
         uses: php-actions/composer@v6
         with:
           command: update
-          php_version: "7.4"
+          php_version: "8.1"
 
       - name: PHPStan Static Analysis
         uses: php-actions/phpstan@v3

diff --git a/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php b/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php
@@ -55,7 +55,7 @@ public static function renderStatic(
     ) {
         $logoUrl = $arguments['logo'];
         // is valid uri?
-        if (GeneralUtility::isValidUrl($logoUrl)) {
+        if (isset($logoUrl) && GeneralUtility::isValidUrl($logoUrl)) {
             // calculate cache identifier
             $logoInfo = pathinfo($logoUrl);
             $cacheIdentifier = md5($logoUrl) . '.' . $logoInfo['extension'];

diff --git a/Classes/ViewHelpers/XpathViewHelper.php b/Classes/ViewHelpers/XpathViewHelper.php
@@ -25,7 +25,6 @@
  ***************************************************************/
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -144,10 +143,7 @@ public static function renderStatic(
     private static function getDocumentRepository()
     {
         if (null === static::$documentRepository) {
-            $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-            static::$documentRepository = $objectManager->get(
-                DocumentRepository::class
-            );
+            static::$documentRepository = GeneralUtility::makeInstance(DocumentRepository::class);
         }
 
         return static::$documentRepository;

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 call_user_func(function()
 {

diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 // Add default Typoscript
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'SlubDigitalcollections',

diff --git a/Configuration/TsConfig/All.tsconfig b/Configuration/TsConfig/All.tsconfig
@@ -1,4 +1,5 @@
 #
 # PageTS for SLUB Digitalcollections
 #
-<INCLUDE_TYPOSCRIPT: source="DIR:EXT:slub_digitalcollections/Configuration/TsConfig/Mod/" extensions="tsconfig">
+@import 'EXT:slub_digitalcollections/Configuration/TsConfig/Mod/WebLayout/BackendLayouts/*.tsconfig'
+@import 'EXT:slub_digitalcollections/Configuration/TsConfig/Mod/Wizards/NewContentElement/*.tsconfig'
diff --git a/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript b/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript
@@ -1,4 +1,4 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/common.typoscript">
+@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/common.typoscript'
 
 plugin.tx_dlf {
     persistence {

diff --git a/Configuration/TypoScript/SitePackage/setup.typoscript b/Configuration/TypoScript/SitePackage/setup.typoscript
@@ -66,4 +66,4 @@ page {
 
 }
 
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:slub_digitalcollections/Configuration/TypoScript/SitePackage/navigation.typoscript">
+@import 'EXT:slub_digitalcollections/Configuration/TypoScript/SitePackage/navigation.typoscript'
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
@@ -142,18 +142,16 @@ page {
 # --------------------------------------------------------------------------------------------------------------------
 # The condition is necessary because you cannot nest TypoScript conditions. But inside the included TypoScript files,
 # more conditions appear.
-
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/singleCollection.typoscript">
-
+@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript'
+@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/singleCollection.typoscript'
 # --------------------------------------------------------------------------------------------------------------------
 # body class overrides
 # --------------------------------------------------------------------------------------------------------------------
-[getTSFE().id == {$config.collectionView}]
+[getTSFE() && getTSFE().id == {$config.collectionView}]
 page.bodyTag = <body class="collections">
 # render content parts only
 [END]
 
-[getTSFE().id == {$config.listView}]
+[getTSFE() && getTSFE().id == {$config.listView}]
 page.bodyTag = <body class="listview">
 [END]
diff --git a/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html b/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html
@@ -46,8 +46,7 @@
                 pageUid="{settings.targetPid}"
                 additionalParams="{f:if(condition:'{child.id}', then:'{\'tx_dlf[id]\':child.id, \'tx_dlf[page]\':child.page}', else: '{\'tx_dlf[page]\':child.page}')}"
                 argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}"
-                addQueryString="1"
-                addQueryStringMethod="GET"
+                addQueryString="untrusted"
                 title="{f:if(condition:'{child.title}', then: '{child.title}', else: '{child.type}')}">
                     <f:render partial="TableOfContents/Title" arguments="{child: child}"/>
             </f:link.action>
@@ -61,7 +60,7 @@
                     action="main"
                     controller="Basket"
                     additionalParams="{'tx_dlf[addToBasket]':'toc', 'tx_dlf[logId]':child.basketButton.logId, 'tx_dlf[startpage]':child.basketButton.startpage, 'tx_dlf_basket[action]':'add', 'tx_dlf_basket[controller]':'Basket'}"
-                    addQueryString="1">
+                    addQueryString="untrusted">
                         <f:translate key="AddToBasket" />
                 </f:link.action>
         </span>

diff --git a/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html
@@ -25,15 +25,15 @@
             <f:if condition="{viewData.requestData.double}">
                 <f:then>
                     <div class="tx-dlf-navigation-double">
-                        <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[double]':'0'}"
+                        <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[double]':'0'}"
                                        argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                             <f:translate key="doublePageOn"/>
                         </f:link.action>
                     </div>
                     <div class="tx-dlf-navigation-double+">
                         <f:if condition="{viewData.requestData.double} && ({viewData.requestData.page} < {numPages})">
                             <f:then>
-                                <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + 1}'}"
+                                <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + 1}'}"
                                                argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                                     <f:translate key="doublePage+1"/>
                                 </f:link.action>
@@ -47,7 +47,7 @@
                     </div>
                 </f:then>
                 <f:else>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[double]':'1'}"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[double]':'1'}"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="doublePageOn"/>
                     </f:link.action>
@@ -69,7 +69,7 @@
         <span class="first">
             <f:if condition="{viewData.requestData.page} > 1">
                 <f:then>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'1'}" class="first"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'1'}" class="first"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="firstPage"/>
                     </f:link.action>
@@ -87,7 +87,7 @@
     <span class="rwnd">
         <f:if condition="{viewData.requestData.page} > {pageSteps}">
             <f:then>
-                <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page - pageSteps}'}"
+                <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page - pageSteps}'}"
                                argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                     <f:translate key="backXPages" arguments="{0: '{pageSteps}'}"/>
                 </f:link.action>
@@ -105,7 +105,7 @@
         <span class="prev">
             <f:if condition="{viewData.requestData.page} > {viewData.requestData.double + 1}">
                 <f:then>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page - 1 - viewData.requestData.double}'}"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page - 1 - viewData.requestData.double}'}"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="prevPage"/>
                     </f:link.action>
@@ -149,7 +149,7 @@
         <span class="next">
             <f:if condition="{viewData.requestData.page + viewData.requestData.double} < {numPages}">
                 <f:then>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + 1 + viewData.requestData.double}'}"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + 1 + viewData.requestData.double}'}"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="nextPage"/>
                     </f:link.action>
@@ -167,7 +167,7 @@
         <span class="fwd">
             <f:if condition="{viewData.requestData.page} <= {numPages - pageSteps}">
                 <f:then>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + pageSteps}'}"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{viewData.requestData.page + pageSteps}'}"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="forwardXPages" arguments="{0: '{pageSteps}'}"/>
                     </f:link.action>
@@ -185,7 +185,7 @@
         <span class="last">
             <f:if condition="{viewData.requestData.page} < {numPages - viewData.requestData.double}">
                 <f:then>
-                    <f:link.action addQueryString="1" addQueryStringMethod="GET" additionalParams="{'tx_dlf[page]':'{numPages - viewData.requestData.double}'}"
+                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[page]':'{numPages - viewData.requestData.double}'}"
                                    argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}">
                         <f:translate key="lastPage"/>
                     </f:link.action>
@@ -244,7 +244,7 @@
                     <f:if condition="{currentMeasure} > 1">
                         <f:then>
                             <f:variable name="prevMeasure" value="{currentMeasure - 1}" />
-                            <f:link.action addQueryString="1" additionalParams="{'tx_dlf[measure]':'{currentMeasure - 1}', 'tx_dlf[page]':'{measurePages.{prevMeasure}}'}">
+                            <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[measure]':'{currentMeasure - 1}', 'tx_dlf[page]':'{measurePages.{prevMeasure}}'}">
                                 <f:translate key="prevMeasure"/>
                             </f:link.action>
                         </f:then>
@@ -270,13 +270,13 @@
                             <f:if condition="{currentMeasure} > 0">
                                 <f:then>
                                     <f:variable name="nextMeasure" value="{currentMeasure + 1}" />
-                                    <f:link.action addQueryString="1" additionalParams="{'tx_dlf[measure]':'{currentMeasure + 1}', 'tx_dlf[page]':'{measurePages.{nextMeasure}}'}">
+                                    <f:link.action addQueryString="untrusted" additionalParams="{'tx_dlf[measure]':'{currentMeasure + 1}', 'tx_dlf[page]':'{measurePages.{nextMeasure}}'}">
                                         <f:translate key="nextMeasure"/>
                                     </f:link.action>
                                 </f:then>
                                 <f:else>
                                     <f:link.action
-                                            addQueryString="1" additionalParams="{'tx_dlf[measure]':'1', 'tx_dlf[page]':'{measurePages.1}'}">
+                                            addQueryString="untrusted" additionalParams="{'tx_dlf[measure]':'1', 'tx_dlf[page]':'{measurePages.1}'}">
                                         <f:translate key="nextMeasure"/>
                                     </f:link.action>
                                 </f:else>

diff --git a/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html b/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html
@@ -3,10 +3,10 @@
     <f:if condition="{pagination.previousPageNumberG} && {pagination.previousPageNumberG} >= {pagination.firstPageNumber}">
         <f:then>
             <li class="first">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': 1}" arguments="{searchParameter: lastSearch}" title="1">1</f:link.action>
+                <f:link.action action="{action}" addQueryString="untrusted" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': 1}" arguments="{searchParameter: lastSearch}" title="1">1</f:link.action>
             </li>
             <li class="previous">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.previousPageNumber}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'pagination.previous')}">{f:translate(key: 'prevPage')}</f:link.action>
+                <f:link.action action="{action}" addQueryString="untrusted" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.previousPageNumber}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'pagination.previous')}">{f:translate(key: 'prevPage')}</f:link.action>
             </li>
         </f:then>
         <f:else>
@@ -43,7 +43,7 @@
                     </f:case>
                     <f:defaultCase>
                         <li class="{f:if(condition: '{page.label} == {paginator.currentPageNumber}', then:'current')}">
-                            <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': page.startRecordNumber}" arguments="{searchParameter: lastSearch}">{page.label}</f:link.action>
+                            <f:link.action action="{action}" addQueryString="untrusted" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': page.startRecordNumber}" arguments="{searchParameter: lastSearch}">{page.label}</f:link.action>
                         </li>
                     </f:defaultCase>
                 </f:switch>
@@ -53,10 +53,10 @@
     <f:if condition="{pagination.nextPageNumberG} && {pagination.nextPageNumberG} <= {pagination.lastPageNumber}">
         <f:then>
             <li class="last">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.lastPageNumberG}" arguments="{searchParameter: lastSearch}" title="{pagination.lastPageNumber}">{pagination.lastPageNumber}</f:link.action>
+                <f:link.action action="{action}" addQueryString="untrusted" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.lastPageNumberG}" arguments="{searchParameter: lastSearch}" title="{pagination.lastPageNumber}">{pagination.lastPageNumber}</f:link.action>
             </li>
             <li class="next">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.nextPageNumber}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'nextPage')}">{f:translate(key: 'nextPage')}</f:link.action>
+                <f:link.action action="{action}" addQueryString="untrusted" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.nextPageNumber}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'nextPage')}">{f:translate(key: 'nextPage')}</f:link.action>
             </li>
         </f:then>
         <f:else>

diff --git a/Resources/Public/Icons/Extension.png b/Resources/Public/Icons/Extension.png
diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
   ],
   "license": "GPL-3.0-or-later",
   "require": {
-    "php": "7.4 - 8.3",
-    "typo3/cms-core": "^10.4|^11.5",
-    "kitodo/presentation": "^5.1|dev-main"
+    "php": "8.1 - 8.3",
+    "typo3/cms-core": "^11.5.40|^12.4.21",
+    "kitodo/presentation": "dev-main"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.12"

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -19,8 +19,9 @@
 	'lockType' => '',
 	'version' => '4.1.0',
 	'constraints' => array(
-		'depends' => array(
-			'typo3' => '10.4.99-11.5.99',
-		),
+        'depends' => [
+            'php' => '8.1.0-8.3.99',
+            'typo3' => '11.5.0-12.4.99'
+        ],
 	),
 );
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 // plugins
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
@@ -34,3 +34,4 @@
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['slub_digitalcollections_collections']['options']['defaultLifeTime'])) {
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['slub_digitalcollections_collections']['options']['defaultLifeTime'] = 3600; // 3600 = 1 hour
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -66,4 +66,4 @@ page {

		}

		<INCLUDE_TYPOSCRIPT: source="FILE:EXT:slub_digitalcollections/Configuration/TypoScript/SitePackage/navigation.typoscript">
		@import 'EXT:slub_digitalcollections/Configuration/TypoScript/SitePackage/navigation.typoscript'