diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index fbc4a99ec..f39cbf59d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -1,50 +1,11 @@ # Development -## Kitodo.Presentation 4.0 - -- In Extbase, there is a default naming scheme to map model names to database - table names. As we currently don't use these for historic reasons, the mapping - needs to be reconfigured: - - - [ext_typoscript_setup.txt](ext_typoscript_setup.txt) is for compatibility - with TYPO3 v9. - - [Classes.php](Configuration/Extbase/Persistence/Classes.php) is for TYPO3 - v10 onwards. - - `polyfillExtbaseClassesForTYPO3v9` (defined in [Helper.php](Classes/Common/Helper.php)) - is used for TYPO3 v9 compatibility with the expression language function - `getDocumentType()` ([DocumentTypeFunctionProvider.php](Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php)). - - To simplify this, we may consider to rename database tables according to the - default naming scheme. - - -## Future Changes - -### TCA type "language" -The TCA field 'sys_language_uid' of table 'tx_dlf_collections' is defined as the 'languageField' and should therefore use the TCA type 'language' instead of TCA type 'select' with 'foreign_table=sys_language' or 'special=languages'. - -### Forward() in controller actions will be removed in TYPO3 12 - -Instead of calling $this->forward() the controller action must return a ForwardResponse - -https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/11.0/Deprecation-92815-ActionControllerForward.html - -### Pagination Widget will be removed in TYPO3 11 - -https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/11.0/Breaking-92529-AllFluidWidgetFunctionalityRemoved.html - -The current solution does only work with TYPO3 9 and 10. - -As of TYPO3 10 a new pagination API has been introduced. This could be used as replacement in a release supporting TYPO3 10 and 11. - -https://docs.typo3.org/m/typo3/reference-coreapi/10.4/en-us/ApiOverview/Pagination/Index.html - ## Testing Before running any of the tests, please install the project dependencies. Choose which version of TYPO3 you would like to test against. ```bash -# If you use PHP 7.3 or 7.4 (supported by Kitodo) +# If you use PHP 7.4 (supported by Kitodo) composer update --with=typo3/cms-core:^10.4 # If you use PHP 8 @@ -60,7 +21,7 @@ composer test # Run specific kind of tests composer test:unit -composer test:unit:local # Run using locally installed PHP +composer test:unit:local # Run using locally installed PHP composer test:func # Run tests in watch mode @@ -78,14 +39,14 @@ vendor/bin/phpunit -c Build/Test/UnitTests.xml # Run in Docker Build/Test/runTests.sh -Build/Test/runTests.sh -w # Watch mode +Build/Test/runTests.sh -w # Watch mode ``` Functional tests may only be run in Docker as they require more infrastructure to be set up. ```bash Build/Test/runTests.sh -s functional -Build/Test/runTests.sh -s functional -w # Watch mode +Build/Test/runTests.sh -s functional -w # Watch mode ``` To learn about available options (e.g., to select the PHP version), check the usage info: @@ -98,7 +59,7 @@ You may also interact with the Docker containers directly: ```bash cd Build/Test/ -vim .env # Edit configuration +vim .env # Edit configuration docker compose run unit docker compose run functional docker compose down diff --git a/Documentation/guides.xml b/Documentation/guides.xml index 68f35cdec..8ffb02da3 100644 --- a/Documentation/guides.xml +++ b/Documentation/guides.xml @@ -1,6 +1,6 @@ - + diff --git a/ext_emconf.php b/ext_emconf.php index bb22802d0..9d879f548 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -13,7 +13,7 @@ $EM_CONF[$_EXTKEY] = [ 'title' => 'Kitodo.Presentation', 'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Kitodo Digitization Suite.', - 'version' => '5.0.6', + 'version' => '5.1.0', 'category' => 'misc', 'constraints' => [ 'depends' => [ diff --git a/ext_typoscript_setup.txt b/ext_typoscript_setup.txt deleted file mode 100644 index 00db5b8ac..000000000 --- a/ext_typoscript_setup.txt +++ /dev/null @@ -1,78 +0,0 @@ -# TODO: This whole file can get discarded when support for TYPO3 9.5 ends. - -config.tx_extbase { - persistence { - classes { - Kitodo\Dlf\Domain\Model\ActionLog { - mapping { - tableName = tx_dlf_actionlog - } - } - Kitodo\Dlf\Domain\Model\Basket { - mapping { - tableName = tx_dlf_basket - } - } - Kitodo\Dlf\Domain\Model\Collection { - mapping { - tableName = tx_dlf_collections - } - } - Kitodo\Dlf\Domain\Model\Document { - mapping { - tableName = tx_dlf_documents - } - } - Kitodo\Dlf\Domain\Model\Format { - mapping { - tableName = tx_dlf_formats - } - } - Kitodo\Dlf\Domain\Model\Library { - mapping { - tableName = tx_dlf_libraries - } - } - Kitodo\Dlf\Domain\Model\Mail { - mapping { - tableName = tx_dlf_mail - } - } - Kitodo\Dlf\Domain\Model\Metadata { - mapping { - tableName = tx_dlf_metadata - } - } - Kitodo\Dlf\Domain\Model\MetadataFormat { - mapping { - tableName = tx_dlf_metadataformat - } - } - Kitodo\Dlf\Domain\Model\MetadataSubentry { - mapping { - tableName = tx_dlf_metadatasubentries - } - } - Kitodo\Dlf\Domain\Model\Printer { - mapping { - tableName = tx_dlf_printer - } - } - Kitodo\Dlf\Domain\Model\SolrCore { - mapping { - tableName = tx_dlf_solrcores - } - } - Kitodo\Dlf\Domain\Model\Structure { - mapping { - tableName = tx_dlf_structures - } - } - Kitodo\Dlf\Domain\Model\Token { - mapping { - tableName = tx_dlf_tokens - } - } - } - } -}