[RELEASE] 13.0.0-alpha-1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,7 +32,7 @@ If applicable, add screenshots to help explain your problem.
  - Browser: [e.g. chrome, safari]
  - 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]
+ - Used Apache Solr Version: [e.g. 9.7.0]
  - PHP Version: [e.g. 8.2.0]
  - MySQL Version: [e.g. 8.0.0]
 

.github/workflows/ci.yml

@@ -38,10 +38,10 @@ jobs:
         PHP: [ '8.2', '8.3' ]
         TYPO3: [ 'dev-main' ]
     env:
-      TYPO3_DATABASE_NAME: 'typo3_ci'
-      TYPO3_DATABASE_HOST: '127.0.0.1'
-      TYPO3_DATABASE_USERNAME: 'root'
-      TYPO3_DATABASE_PASSWORD: 'root'
+      typo3DatabaseName: 'typo3_ci'
+      typo3DatabaseHost: '127.0.0.1'
+      typo3DatabaseUsername: 'root'
+      typo3DatabasePassword: 'root'
       TYPO3_VERSION: ${{ matrix.TYPO3 }}
 
     name: TYPO3 ${{ matrix.TYPO3 }} on PHP ${{ matrix.PHP }}
@@ -88,8 +88,8 @@ jobs:
         name: 'Start Docker: Solr, Tika, MySQL'
         run: |
           docker run --name "MySQL-CI" -v ${{ env.CI_BUILD_DIRECTORY }}/data-mysql:/var/lib/mysql -p 3306:3306 \
-            -e MYSQL_DATABASE=$TYPO3_DATABASE_NAME \
-            -e MYSQL_ROOT_PASSWORD=$TYPO3_DATABASE_PASSWORD \
+            -e MYSQL_DATABASE=$typo3DatabaseName \
+            -e MYSQL_ROOT_PASSWORD=$typo3DatabasePassword \
             -d mysql:8.0 mysqld --default-authentication-plugin=mysql_native_password
           sudo chmod g+w "$SOLR_VOLUME_PATH"
           docker volume create --name "$SOLR_VOLUME_NAME" --opt type=none --opt device="$SOLR_VOLUME_PATH" --opt o=bind
@@ -98,18 +98,49 @@ jobs:
           docker ps
       -
         name: CI-Bootstrap
+        id: 'bootstrap'
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           composer info
-          composer tests:setup && composer tests:setup:global-require
+          composer tests:setup
           echo "Current Size of EXT:tika build Artefacts: " \
             && sudo du -sh "${{ env.CI_BUILD_DIRECTORY }}"
       -
-        name: CI-Build
+        name: 'PHP Lint'
+        id: 'php-lint'
+        if: ${{ always() }}
         run: |
-          ./.Build/vendor/apache-solr-for-typo3/solr/Build/Test/cibuild.sh
-          echo "Current Size of EXT:tika build Artefacts: " \
-            && sudo du -sh $CI_BUILD_DIRECTORY/ \
-            && sudo du -sh $CI_BUILD_DIRECTORY/*
+          composer tests:lint-php
+      -
+        name: 'Coding standards'
+        id: 'coding-standards'
+        if: ${{ always() }}
+        run: |
+          composer t3:standards:check
+      -
+        name: 'XML Lint'
+        id: 'xml-lint'
+        if: ${{ always() }}
+        run: |
+          composer tests:lint-xml
+      - name: 'PHPStan'
+        id: 'phpstan'
+        if: ${{ always() }}
+        run: |
+          composer tests:phpstan
+      -
+        name: 'Unit tests'
+        id: 'unit-tests'
+        if: ${{ always() }}
+        run: |
+          composer tests:unit
+      -
+        name: 'Integration tests'
+        id: 'integration-tests'
+        if: ${{ always() }}
+        run: |
+          composer tests:integration
 
   publish:
     name: Publish new version to TER
@@ -149,7 +180,7 @@ jobs:
         name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: intl, mbstring, json, zip, curl
           tools: composer:v2
       -

Build/Test/IntegrationTests.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
 	backupGlobals="true"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
@@ -13,12 +13,13 @@
 	displayDetailsOnTestsThatTriggerWarnings="true"
 	failOnDeprecation="true"
 	failOnNotice="true"
+	failOnPhpunitDeprecation="true"
 	failOnRisky="true"
 	failOnWarning="true"
 	requireCoverageMetadata="false"
 	processIsolation="true"
 >
-	<coverage includeUncoveredFiles="false"></coverage>
+	<coverage></coverage>
 	<source>
 		<include>
 			<directory>../../Classes</directory>

Build/Test/UnitTests.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
 	backupGlobals="true"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
@@ -13,6 +13,7 @@
 	displayDetailsOnTestsThatTriggerWarnings="true"
 	failOnDeprecation="true"
 	failOnNotice="true"
+	failOnPhpunitDeprecation="true"
 	failOnRisky="true"
 	failOnWarning="true"
 	requireCoverageMetadata="false"

Classes/Process.php

@@ -102,7 +102,7 @@ public function findPid(): ?int
         exec($ps, $output);
 
         foreach ($output as $line) {
-            [$pid, $command] = explode(' ', trim($line ?? ''), 2);
+            [$pid, $command] = explode(' ', trim($line), 2);
             $command = $this->escapePsOutputCommand($command);
             if ($command == $processCommand) {
                 return (int)$pid;

Documentation/Releases/12_0.rst

@@ -2,7 +2,10 @@
 ..  index:: Releases
 ..  _releases-tika-12_0:
 
-==============
+=============
+Releases 13.0
+=============
+
 Release 12.0.2
 ==============
 
@@ -14,7 +17,7 @@ This is maintenance release for TYPO3 12.
 - [TASK] Add tests for documentation `c9e18ca <https://github.com/TYPO3-Solr/ext-tika/commit/c9e18ca>`_ (thanks to @dkd-kaehm)
 - [TASK] Set min. TYPO3  version to 12.4.3 `4a9e209 <https://github.com/TYPO3-Solr/ext-tika/commit/4a9e209>`_ (thanks to @dkd-kaehm)
 - [DOCS] Fix repository URL in releases documentation `3f3250e <https://github.com/TYPO3-Solr/ext-tika/commit/3f3250e>`_ (thanks to @dkd-kaehm)
-==============
+
 Release 12.0.1
 ==============
 
@@ -59,7 +62,6 @@ All other changes
 - [FEATURE] Blind the Solr Cell crendetials in TYPO3 configuration tools `6618965 on @2023-10-19 <https://github.com/TYPO3-Solr/ext-tika/commit/6618965>`_ (thanks to Rafael Kähm)
 - [DOC] reafactor the docs `c899cf8 on @2023-10-19 <https://github.com/TYPO3-Solr/ext-tika/commit/c899cf8>`_ (thanks to Rafael Kähm)
 
-==============
 Release 12.0.0
 ==============
 

Documentation/Releases/13_0.rst

@@ -2,30 +2,41 @@
 ..  index:: Releases
 ..  _releases-tika-13_0:
 
-==============
-Release 13.0.0
-==============
+=============
+Releases 13.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
--------------------
+Release 13.0.0-alpha-1
+======================
+
+This is a first alpha release for upcoming TYPO3 13 LTS
 
-- TBD
+All changes:
+------------
 
+*   [TASK] Prepare main branch for TYPO3 13 by @dkd-kaehm
+*   [TASK] Update to typo3/coding-standards v0.8.0 by @dkd-friedrich
+*   [TASK] Update PHPUnit and testing framework by @dkd-friedrich
+*   [TASK] Update dependencies for TYPO3 13.0.x by @dkd-friedrich
 
 Contributors
 ------------
 
-- TBD
+*   Markus Friedrich
+*   Rafael Kähm
 
 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:
+Also a big thanks to our partners that have joined the Apache Solr EB für TYPO3 13 LTS (Feature) program:
 
-- TBD
+*   b13 GmbH
+*   Berlin-Brandenburgische Akademie der Wissenschaften
+*   in2code GmbH
+*   mehrwert intermediale kommunikation GmbH
 
 How to Get Involved
 -------------------

Documentation/Settings.cfg

@@ -2,7 +2,7 @@
 
 project     = Apache Tika for TYPO3
 version     = 13.0.0
-release     = 13.0.0
+release     = 13.0.0-alpha-1
 t3author    = Ingo Renner, Timo Hund, dkd and contributors
 copyright   = since 2009 by dkd & contributors
 

Tests/Integration/Service/Tika/ServerServiceTest.php

@@ -82,7 +82,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);
             });

Tests/Unit/Service/Tika/AbstractServiceTest.php → Tests/Unit/Service/Tika/AbstractServiceTestBase.php

@@ -2,11 +2,6 @@
 
 declare(strict_types=1);
 
-namespace ApacheSolrForTypo3\Tika\Tests\Unit\Service\Tika;
-
-use ApacheSolrForTypo3\Tika\Service\Tika\AbstractService;
-use ApacheSolrForTypo3\Tika\Tests\Unit\UnitTestCase;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -20,20 +15,28 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace ApacheSolrForTypo3\Tika\Tests\Unit\Service\Tika;
+
+use ApacheSolrForTypo3\Tika\Service\Tika\AbstractService;
+use ApacheSolrForTypo3\Tika\Tests\Unit\UnitTestCase;
 use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class AbstractServiceTest
+ * Base test class AbstractServiceTestBase
  */
-class AbstractServiceTest extends UnitTestCase
+abstract class AbstractServiceTestBase extends UnitTestCase
 {
+    protected string $serviceClass = '';
+
     #[Test]
     public function constructorCallsInitializeService(): void
     {
-        $service = $this->getMockBuilder(AbstractService::class)
+        /** @var AbstractService&MockObject $service */
+        $service = $this->getMockBuilder($this->serviceClass)
             ->onlyMethods(['initializeService'])
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $service->expects(self::once())
             ->method('initializeService');

Tests/Unit/Service/Tika/AppServiceTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApacheSolrForTypo3\Tika\Tests\Unit\Service\Tika;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use ApacheSolrForTypo3\Tika\Service\Tika\AppService;
+
+/**
+ * Class AppServiceTest
+ */
+class AppServiceTest extends AbstractServiceTestBase
+{
+    protected string $serviceClass = AppService::class;
+}

Tests/Unit/Service/Tika/ServerServiceTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApacheSolrForTypo3\Tika\Tests\Unit\Service\Tika;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use ApacheSolrForTypo3\Tika\Service\Tika\ServerService;
+
+/**
+ * Class ServerServiceTest
+ */
+class ServerServiceTest extends AbstractServiceTestBase
+{
+    protected string $serviceClass = ServerService::class;
+}

Tests/Unit/Service/Tika/SolrCellServiceTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApacheSolrForTypo3\Tika\Tests\Unit\Service\Tika;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use ApacheSolrForTypo3\Tika\Service\Tika\SolrCellService;
+
+/**
+ * Class SolrCellServiceTest
+ */
+class SolrCellServiceTest extends AbstractServiceTestBase
+{
+    protected string $serviceClass = SolrCellService::class;
+}