Skip to content

Commit

Permalink
Merge pull request slub#160 from albig/remove-87
Browse files Browse the repository at this point in the history
Remove Support of TYPO3 8.7
  • Loading branch information
Alexander Bigga authored Aug 25, 2020
2 parents b8d6a33 + 07d4091 commit 471850d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/
.vscode/
.DS_Store
node_modules
Resources/Public/Css/allStyles.css.map
Expand Down
2 changes: 1 addition & 1 deletion Classes/Plugins/GridPager.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function main($content, $conf)
'page' => NULL
), TRUE);
} else {
$markerArray['###FIRST###'] = '<span>' . $this->pi_getLL('firstPage', '', TRUE) . '</span>';
$markerArray['###FIRST###'] = '<span>' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '</span>';
}

// Link back X pages.
Expand Down
2 changes: 1 addition & 1 deletion Classes/Plugins/Sru/Sru.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ protected function addSearchFormJS()
{
$pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
// Add SRU specific Javascript.
$pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/tx_dfgviewer_sru.js');
$pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/tx_dfgviewer_sru.js');
}

/**
Expand Down
27 changes: 6 additions & 21 deletions Documentation/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dfgviewer* extension.
Installation
============

The current release 5.x will only work with TYPO3 8.7 LTS or 9.5 LTS.
The current release 5.x will only work with 9.5 LTS.

The extension is based on `Kitodo.Presentation (dlf) <https://github.com/kitodo/kitodo-presentation>`_. Before you can start to
use the *DFG Viewer (dfgviewer)* in your TYPO3 installation, you have to install
Expand All @@ -29,10 +29,10 @@ We recommend at least:
* Memory: 2 GB
* Disk: 20 GB

Install a fresh TYPO3 8.7 LTS
Install a fresh TYPO3 9.5 LTS
-----------------------------

To install a fresh TYPO3 (8.7 or 9.5) system, try the following installation procedure with composer::
To install a fresh TYPO3 9.5 system, try the following installation procedure with composer::

# Assuming the following settings:
# * the installation directory is /var/www/dfgviewer
Expand All @@ -44,7 +44,6 @@ To install a fresh TYPO3 (8.7 or 9.5) system, try the following installation pro
www-data@localhost:/var/www> rm -r dfgviewer/
# load full TYPO3 via composer
www-data@localhost:/var/www> composer create-project typo3/cms-base-distribution:^9.5 dfgviewer
# If you want to use TYPO3 8 LTS then use this command: "composer create-project typo3/cms-base-distribution:^8.7 dfgviewer"
# create FIRST_INSTALL file
www-data@localhost:/var/www> cd dfgviewer/
www-data@localhost:/var/www/dfgviewer> touch public/FIRST_INSTALL
Expand Down Expand Up @@ -80,32 +79,18 @@ Your *typo3conf/LocalConfiguration.php* should contain this::
'pageNotFoundOnCHashError' => '0',
],

Now you have a working TYPO3 8.7 or 9.5 LTS installation and you can continue with composer
Now you have a working TYPO3 9.5 LTS installation and you can continue with composer
to install DFG-Viewer extension.

.. error::

If you are using e.g. TYPO3 8.7 and Debian 10 with MariaDB 10.3 you have to force an
update of Doctrine/Dbal. This is due to a missing feature / bug in
doctring/dbal 2.5.13. TYPO3 8.7 did not changed the dependancies for doctrine/dbal.

This way is working for the DFG-Viewer::

www-data@localhost:/var/www/dfgviewer> composer require doctrine/dbal 2.5.13
# in composer.json, change the following line:
# "doctrine/dbal": "2.7.2 as 2.5.13"
www-data@localhost:/var/www/dfgviewer> composer update doctrine/dbal --with-dependencies


Install DFG-Viewer and Kitodo.Presentation via Composer
-------------------------------------------------------

Composer commands::

composer require kitodo/presentation:^3.1
composer require slub/dfgviewer:^5.0
composer require slub/dfgviewer:^5.1

This will install the DFG-Viewer 5.x extension and Kitodo.Presentation 3.1 from
This will install the DFG-Viewer 5.1 extension and Kitodo.Presentation 3.1 from
`Packagist <https://github.com/slub/dfg-viewer>`_.

Install the Extension via extension manager or CLI::
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[general]
project = DFG-Viewer
release = 5.0.0
release = 5.1.0
t3author = Sebastian Meyer, Alexander Bigga
copyright = 2019 by the author
copyright = 2020 by the author
description = Remote resources navigator for digital libraries. Reads METS/MODS
and METS/TEI via OAI-PMH.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
],
"license": "GPL-3.0-or-later",
"require": {
"typo3/cms-core": "^8.7|~9.5.20",
"typo3/cms-core": "~9.5.20",
"kitodo/presentation": "~3.1.2",
"slub/slub-digitalcollections": "~1.1.0"
},
Expand Down

0 comments on commit 471850d

Please sign in to comment.