[MAINTENANCE] Update to TYPO3 12

Classes/Controller/UriController.php

@@ -26,7 +26,8 @@
  ***************************************************************/
 
 use Kitodo\Dlf\Common\Helper;
-use TYPO3\CMS\Core\Utility\MathUtility;
+use Kitodo\Dlf\Controller\AbstractController;
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -37,21 +38,21 @@
  * @subpackage dlf
  * @access public
  */
-class UriController extends \Kitodo\Dlf\Controller\AbstractController
+class UriController extends AbstractController
 {
     /**
      * The main method of the plugin
      *
-     * @return void
+     * @return ResponseInterface
      */
-    public function mainAction()
+    public function mainAction(): ResponseInterface
     {
         // Load current document.
         $this->loadDocument();
 
         if ($this->isDocMissingOrEmpty()) {
             // Quit without doing anything if required variables are not set.
-            return;
+            return $this->htmlResponse();
         }
 
         $this->setPage();
@@ -84,26 +85,30 @@ public function mainAction()
             }
         }
 
-        // Get persistent identifier of page.
-        $uriPage = GeneralUtility::trimExplode(' ', $doc->physicalStructureInfo[$doc->physicalStructure[$this->requestData['page']]]['contentIds'], TRUE);
+        if (isset($this->requestData['page'])) {
+            // Get persistent identifier of page.
+            $uriPage = GeneralUtility::trimExplode(' ', $doc->physicalStructureInfo[$doc->physicalStructure[$this->requestData['page']]]['contentIds'], TRUE);
 
-        if (!empty($uriPage)) {
-            $uris = [];
+            if (!empty($uriPage)) {
+                $uris = [];
 
-            foreach ($uriPage as $uri) {
-                if (Helper::isValidHttpUrl($uri)) {
-                    $uris[] = $uri;
-                } elseif (strpos($uri, 'urn:') === 0) {
-                    if (strpos($uri, '/fragment/') === false) {
-                        $uris[] = 'https://nbn-resolving.de/' . $uri;
-                    } else {
-                        $uris[] = 'https://nbn-resolving.org/' . $uri;
+                foreach ($uriPage as $uri) {
+                    if (Helper::isValidHttpUrl($uri)) {
+                        $uris[] = $uri;
+                    } elseif (strpos($uri, 'urn:') === 0) {
+                        if (strpos($uri, '/fragment/') === false) {
+                            $uris[] = 'https://nbn-resolving.de/' . $uri;
+                        } else {
+                            $uris[] = 'https://nbn-resolving.org/' . $uri;
+                        }
                     }
                 }
-            }
-            if (!empty($uris)) {
-                $this->view->assign('uriPages', $uris);
+                if (!empty($uris)) {
+                    $this->view->assign('uriPages', $uris);
+                }
             }
         }
+
+        return $this->htmlResponse();
     }
 }

Configuration/Services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Slub\Dfgviewer\:
+      resource: '../Classes/*'

Configuration/TCA/Overrides/pages.php

@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die('Access denied.');
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile (
 'dfgviewer',

Configuration/TCA/Overrides/sys_template.php

@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die('Access denied.');
 
 // Register static typoscript.
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(

Configuration/TCA/Overrides/tt_content.php

@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die('Access denied.');
 
 // Plugin "uri".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dfgviewer_uri'] = 'layout,select_key,pages,recursive';

Configuration/TsConfig/Page.tsconfig

@@ -1,7 +1,7 @@
 ##############
 #### PAGE ####
 ##############
-<INCLUDE_TYPOSCRIPT: source="DIR:EXT:dfgviewer/Configuration/TsConfig/Page/" extensions="tsconfig">
+@import 'EXT:dfgviewer/Configuration/TypoScript/TsConfig/Page/*.tsconfig'
 
 
 # PAGE DEFAULT PERMISSIONS

Configuration/TypoScript/Navigation/language.typoscript

@@ -2,6 +2,7 @@
 # Header Language Navigation
 # ----------------------------------------
 
+
 lib.menu {
   language = COA
   language {
@@ -11,7 +12,7 @@ lib.menu {
       # show only Default and English
       special.value = 0,1
 
-      addQueryString = 1
+      addQueryString = untrusted
       addQueryString.method = GET
       addQueryString.exclude = cHash
 
@@ -21,7 +22,8 @@ lib.menu {
         noBlur = 1
         NO = 1
         NO {
-          linkWrap=<li>|</li>
+          before = <li>
+          after = </li>
           stdWrap.override = DE || EN
           ATagTitle.override = Sprache: Deutsch || Language: English
         }

Configuration/TypoScript/Page/page.typoscript

@@ -6,7 +6,7 @@ page {
   bodyTag = <body class="website">
 
   adminPanelStyles = 0
-  shortcutIcon = EXT:dfgviewer/Resources/Public/Images/dfgviewerFavicon.png
+  shortcutIcon = EXT:dfgviewer/Resources/Public/Icons/Extension.png
 
   10 = FLUIDTEMPLATE
   10 {

Configuration/TypoScript/setup.typoscript

@@ -1,11 +1,8 @@
 # Configuration
-<INCLUDE_TYPOSCRIPT: source="DIR:./Config/" extensions="typoscript">
-
+@import 'EXT:dfgviewer/Configuration/TypoScript/Config/*.typoscript'
 # Navigation
-<INCLUDE_TYPOSCRIPT: source="DIR:./Navigation/" extensions="typoscript">
-
+@import 'EXT:dfgviewer/Configuration/TypoScript/Navigation/*.typoscript'
 # Plugin
-<INCLUDE_TYPOSCRIPT: source="DIR:./Plugins/" extensions="typoscript">
-
+@import 'EXT:dfgviewer/Configuration/TypoScript/Plugins/*.typoscript'
 # Page
-<INCLUDE_TYPOSCRIPT: source="DIR:./Page/" extensions="typoscript">
+@import 'EXT:dfgviewer/Configuration/TypoScript/Page/*.typoscript'

Documentation/Index.rst

@@ -10,29 +10,28 @@ dfgviewer* extension.
 Installation
 ============
 
-The current release 6.0 may be used with TYPO3 9.5 LTS or TYPO3 10.4 LTS.
+The current release 6.1 may be used with TYPO3 11.5 or TYPO3 12.4 LTS.
 
-The extension is based on `Kitodo.Presentation (dlf) <https://github.com/kitodo/kitodo-presentation>`_. Before you can start to
+The extension is based on `Kitodo.Presentation (dlf) <https://github.com/kitodo/kitodo-presentation>`_ and `SLUB DigitalCollections (slub_digitalcollections) <https://github.com/slub/slub_digitalcollections>`. Before you can start to
 use the *DFG Viewer (dfgviewer)* in your TYPO3 installation, you have to install
 both extensions. The installation is only supported via Composer.
 Kitodo.Presentation will be installed and configured automatically.
 
 System Requirements
 -------------------
 
-You need a webserver stack with Apache2 or Ngnix, PHP >= 7.3 and MySQL / MariaDB.
-Debian 10 (buster) is known to work with Kitodo.Presentation 3.2 and DFG-Viewer 5.2.
+You need a webserver stack with Apache2 or Nginx, PHP >= 7.4 and MySQL / MariaDB.
 
 We recommend at least:
 
 * CPU: 1
 * Memory: 2 GB
 * Disk: 20 GB
 
-Install a fresh TYPO3 9.5 LTS
+Install a fresh TYPO3 12.4 LTS
 -----------------------------
 
-To install a fresh TYPO3 9.5 system, try the following installation procedure with composer::
+To install a fresh TYPO3 12.4 system, try the following installation procedure with composer::
 
     # Assuming the following settings:
     #   * the installation directory is /var/www/dfgviewer
@@ -43,10 +42,10 @@ To install a fresh TYPO3 9.5 system, try the following installation procedure wi
     # remove /var/www/dfgviewer if it already exist or make sure it's really empty by ls -la dfgviewer/
     rm -r dfgviewer/
     # load full TYPO3 via composer
-    composer create-project typo3/cms-base-distribution:^9.5 dfgviewer
+    composer create-project typo3/cms-base-distribution:^12 dfgviewer
     # Install the TYPO3 system with the TYPO3-console
     cd dfgviewer/
-    ./vendor/bin/typo3cms install:setup
+    ./vendor/bin/typo3 setup
 
 Instead of using the TYPO3-console, you can you can switch to the web-based installation of TYPO3 in your
 browser. Just follow the 4 steps. You need your MySQL/MariaDB credentials of course.::
@@ -81,9 +80,9 @@ Your *typo3conf/LocalConfiguration.php* must contain this::
 
 You can set this easily with the TYPO3-console::
 
-    ./vendor/bin/typo3cms configuration:set 'FE/pageNotFoundOnCHashError' 0
+    ./vendor/bin/typo3 configuration:set 'FE/pageNotFoundOnCHashError' 0
 
-Now you have a working TYPO3 9.5 LTS installation and you can continue with composer
+Now you have a working TYPO3 12.4 LTS installation and you can continue with composer
 to install DFG-Viewer extension.
 
 
@@ -93,17 +92,18 @@ Install DFG-Viewer and Kitodo.Presentation via Composer
 Composer commands::
 
     # make sure you haven't set the platform php version to 7.2
-    composer config platform.php 7.3
+    composer config platform.php
     # install DFG-Viewer extension
-    composer require slub/dfgviewer:^6.0
+    composer require slub/dfgviewer:^6.1
 
-This will install the DFG-Viewer 6.0 extension and Kitodo.Presentation 4.0 from
+This will install the DFG-Viewer 6.1 extension and Kitodo.Presentation 5.0 from
 `Packagist <https://github.com/slub/dfg-viewer>`_.
 
 Install the Extension via extension manager or CLI::
 
     ./vendor/bin/typo3 extension:activate dlf
     ./vendor/bin/typo3 extension:activate dfgviewer
+    ./vendor/bin/typo3 extension:activate slub_digitalcollections
 
 During the installation, three pages will be created: a root page, the "Kitodo
 Configuration" folder and the viewer itself.

Initialisation/Site/dfgviewer/config.yml

@@ -0,0 +1,32 @@
+base: '/'
+baseVariants: {  }
+errorHandling: {  }
+languages:
+    -
+        title: Deutsch
+        enabled: true
+        base: /
+        typo3Language: de
+        locale: de_DE.UTF-8
+        iso-639-1: de
+        navigationTitle: German
+        hreflang: de-DE
+        direction: ltr
+        flag: de
+        languageId: '0'
+    -
+        title: Englisch
+        enabled: true
+        base: /en/
+        typo3Language: default
+        locale: en_US.UTF-8
+        iso-639-1: en
+        navigationTitle: English
+        hreflang: en-US
+        direction: ltr
+        fallbackType: strict
+        fallbacks: '0'
+        flag: gb
+        languageId: '1'
+rootPageId: 1
+routes: {  }