Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TASK] Prepare main branch for TYPO3 13 #229

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Used versions (please complete the following information):**
- TYPO3 Version: [e.g. 12.4.7]
- TYPO3 Version: [e.g. 13.4.0]
- Browser: [e.g. chrome, safari]
- EXT:solr Version: [e.g. 12.0.x]
- EXT:tika Version: [e.g. 12.0.2]
- Used Apache Solr Version: [e.g. 9.3.0]
- PHP Version: [e.g. 8.1.0]
- EXT:solr Version: [e.g. 13.0.x]
- EXT:tika Version: [e.g. 13.0.2]
- Used Apache Solr Version: [e.g. 9.6.0]
- PHP Version: [e.g. 8.2.0]
- MySQL Version: [e.g. 8.0.0]

**Additional context**
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CI_BUILD_DIRECTORY: '/home/runner/work/ext-tika/ext-tika/.Build'
TIKA_PATH: '/home/runner/work/ext-tika/ext-tika/.Build/data-tika-binaries'

SOLR_IMAGE_TAG: '12.0.x-dev'
SOLR_IMAGE_TAG: '13.0.x-dev'
SOLR_CONTAINER_NAME: 'solrci-container'
TESTING_SOLR_PORT: 8983
SOLR_VOLUME_NAME: 'solrci-volume'
Expand All @@ -35,8 +35,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
PHP: [ '8.1', '8.2', '8.3' ]
TYPO3: [ '^12.4', '12.4.x-dev' ]
PHP: [ '8.2', '8.3' ]
TYPO3: [ 'dev-main' ]
env:
TYPO3_DATABASE_NAME: 'typo3_ci'
TYPO3_DATABASE_HOST: '127.0.0.1'
Expand Down
46 changes: 46 additions & 0 deletions Documentation/Releases/13_0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
.. include:: /Includes.rst.txt
.. index:: Releases
.. _releases-tika-13_0:

==============
Release 13.0.0
==============

We are happy to announce version 13.0.0 of EXT:tika.

**Important**: This version is compatible with 13 LTS only.

New in this Release
-------------------

- TBD


Contributors
------------

- TBD

Thanks to everyone who helped in creating this release!

Also a big thanks to our partners that have joined the Apache Solr EB für TYPO3 12 LTS (Feature) program:

- TBD

How to Get Involved
-------------------

There are many ways to get involved with Apache Solr for TYPO3:

- Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-tika)
- Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-tika/)
- Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-tika/pulls)
- Go to [www.typo3-solr.com](http://www.typo3-solr.com) or call [dkd](http://www.dkd.de) to sponsor the ongoing development of Apache Solr for TYPO3

Support us by becoming an EB partner:

http://www.typo3-solr.com/en/contact/

or call:

+49 (0)69 - 2475218 0
1 change: 1 addition & 0 deletions Documentation/Releases/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Releases
:titlesonly:
:glob:

13_0
12_0
11_0
10_0
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 = Apache Tika for TYPO3
version = 12.0.2
release = 12.0.2
version = 13.0.0
release = 13.0.0
t3author = Ingo Renner, Timo Hund, dkd and contributors
copyright = since 2009 by dkd & contributors

Expand Down
2 changes: 1 addition & 1 deletion Tests/Integration/Service/Tika/ServerServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function startServerStoresPidInRegistry(): void
->expects(self::atLeastOnce())
->method('set')
->with('tx_tika', 'server.pid', 1000)
->willReturnCallback(function ($namespace, $key, $value) {
->willReturnCallback(function($namespace, $key, $value) {
self::assertIsInt($value);
self::assertEquals(1000, $value);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function canShowInformationFromStandaloneTikaServer(): void
$this->controller->setTikaConfiguration($tikaConfiguration);
$matcher = self::any();

$this->viewMock->expects($matcher)->method('assign')->willReturnCallback(function () use ($matcher, $tikaConfiguration) {
$this->viewMock->expects($matcher)->method('assign')->willReturnCallback(function() use ($matcher, $tikaConfiguration) {
return match ($matcher->numberOfInvocations()) {
1 => [ 'configuration', $tikaConfiguration ],
2 => [ 'extractor', ucfirst($tikaConfiguration['extractor']) ],
Expand Down
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,23 @@
"typo3-ter/tika": "self.version"
},
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-json": "*",
"ext-pdo": "*",
"typo3/cms-backend": "^v12.4.3",
"typo3/cms-core": "^12.4",
"typo3/cms-extbase": "^v12.4.3",
"typo3/cms-filemetadata": "^v12.4.3",
"typo3/cms-fluid": "^v12.4.3",
"typo3/cms-reports": "^v12.4.3"
"typo3/cms-backend": "^v13.1",
"typo3/cms-core": "^v13.1",
"typo3/cms-extbase": "^v13.1",
"typo3/cms-filemetadata": "^v13.1",
"typo3/cms-fluid": "^v13.1",
"typo3/cms-reports": "^v13.1"
},
"require-dev": {
"apache-solr-for-typo3/solr": "12.0.x-dev",
"apache-solr-for-typo3/solr": "13.0.x-dev",
"dg/bypass-finals": "^1.6",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-phpunit": "^1.3",
"phpunit/phpunit": "^10.1",
"typo3/cms-lowlevel": "*",
"typo3/coding-standards": "~0.7.1",
"typo3/coding-standards": "dev-main#27798dd4b8a15d2178260dbd6aad83fb0d6a017e",
"typo3/testing-framework": "^8.0"
},
"suggest": {
Expand Down Expand Up @@ -149,7 +148,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev"
"dev-main": "13.0.x-dev"
},
"typo3/cms": {
"extension-key": "tika",
Expand All @@ -161,7 +160,7 @@
"require": {
"Tika": "1.28.5",
"Solr": "9.5.*",
"EXT:solr": "12.0.*"
"EXT:solr": "13.0.*"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
$EM_CONF[$_EXTKEY] = [
'title' => 'Apache Tika for TYPO3',
'description' => 'Provides Tika services for TYPO3 to detect a document\'s language, extract meta data, and extract content from files. Can either use a stand alone Tika executable or Tika integrated in a Solr server with an activated extracting request handler.',
'version' => '12.0.2',
'version' => '13.0.0',
'state' => 'stable',
'category' => 'services',
'author' => 'Ingo Renner, Timo Hund, Markus Friedrich, Rafael Kähm',
'author_email' => '[email protected]',
'author_company' => 'dkd Internet Service GmbH',
'constraints' => [
'depends' => [
'typo3' => '12.4.3-12.4.99',
'typo3' => '13.1.0-13.4.99',
'filemetadata' => '',
],
'conflicts' => [],
'suggests' => [
'solr' => '12.0.0-',
'solr' => '13.0.0-',
],
],
'autoload' => [
Expand Down
Loading