Merge branch 'release/9.0.1'

evoWeb · Aug 24, 2024 · 858f2f3 · 858f2f3
2 parents 2a626eb + ac64ac6
commit 858f2f3
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 101 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,50 +34,26 @@ jobs:
     strategy:
       matrix:
         packages:
-          - php: '8.1'
-            core: '^12.4'
-            framework: '^8.0.2'
-            prefer: ''
-            testpath: 'Tests/Functional'
-
-          - php: '8.1'
-            core: '^12.4'
-            framework: '^8.0.2'
-            prefer: '--prefer-lowest'
-            testpath: 'Tests/Functional'
-
-          - php: '8.2'
-            core: '^12.4'
-            framework: '^8.0.2'
-            prefer: ''
-            testpath: 'Tests/Functional'
-
-          - php: '8.2'
-            core: '^12.4'
-            framework: '^8.0.2'
-            prefer: '--prefer-lowest'
-            testpath: 'Tests/Functional'
-
           - php: '8.2'
-            core: '^13.0'
+            core: '^13.2'
             framework: 'dev-main'
             prefer: ''
             testpath: 'Tests/Functional'
 
           - php: '8.2'
-            core: '^13.0'
+            core: '^13.2'
             framework: 'dev-main'
             prefer: '--prefer-lowest'
             testpath: 'Tests/Functional'
 
           - php: '8.3'
-            core: '^13.0'
+            core: '^13.2'
             framework: 'dev-main'
             prefer: ''
             testpath: 'Tests/Functional'
 
           - php: '8.3'
-            core: '^13.0'
+            core: '^13.2'
             framework: 'dev-main'
             prefer: '--prefer-lowest'
             testpath: 'Tests/Functional'

diff --git a/Build/Scripts/test.sh b/Build/Scripts/test.sh
@@ -136,24 +136,17 @@ DEBUG_TESTS=false
 if [[ $DEBUG_TESTS != true ]]; then
     checkResources
 
-    TCORE="^12.4"
-    TFRAMEWORK="^8.0.2"
+    TCORE="^13.2"
+    TFRAMEWORK="dev-main"
     TPATH="Tests/Functional"
     LOWEST="--prefer-lowest"
-    runFunctionalTests "8.1" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
-    runFunctionalTests "8.1" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
-    runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
-    runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
-
-    TCORE="^13.0"
-    TFRAMEWORK="dev-main"
     runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
     runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
     runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
     runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
 else
     cleanup
-    runFunctionalTests "8.2" "^13.0" "dev-main" "Tests/Functional" || exit 1
+    runFunctionalTests "8.2" "^13.2" "dev-main" "Tests/Functional" || exit 1
     cleanup
     # ./runTests.sh -x -p 8.2 -d sqlite -s functional -e "--group selected" Tests/Functional
     # ./runTests.sh -x -p 8.2 -d sqlite -s functional Tests/Functional

diff --git a/Configuration/FlexForms/author.xml b/Configuration/FlexForms/author.xml
@@ -11,8 +11,7 @@
                     <settings.itemsPerPage>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.limit</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>5</default>
                         </config>
                     </settings.itemsPerPage>

diff --git a/Configuration/FlexForms/book.xml b/Configuration/FlexForms/book.xml
@@ -11,8 +11,7 @@
                     <settings.itemsPerPage>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.limit</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>5</default>
                         </config>
                     </settings.itemsPerPage>
@@ -27,8 +26,8 @@
                             <default>-1</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.category.allCategories</numIndex>
-                                    <numIndex index="1">-1</numIndex>
+                                    <numIndex index="label">LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.category.allCategories</numIndex>
+                                    <numIndex index="value">-1</numIndex>
                                 </numIndex>
                             </items>
                             <maxitems>200</maxitems>

diff --git a/Configuration/FlexForms/category.xml b/Configuration/FlexForms/category.xml
@@ -11,8 +11,7 @@
                     <settings.itemsPerPage>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.limit</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>5</default>
                         </config>
                     </settings.itemsPerPage>
@@ -27,8 +26,8 @@
                             <default>-1</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.category.allCategories</numIndex>
-                                    <numIndex index="1">-1</numIndex>
+                                    <numIndex index="label">LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.category.allCategories</numIndex>
+                                    <numIndex index="value">-1</numIndex>
                                 </numIndex>
                             </items>
                             <maxitems>200</maxitems>

diff --git a/Configuration/FlexForms/search.xml b/Configuration/FlexForms/search.xml
@@ -11,24 +11,21 @@
                     <settings.bookPageId>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.bookPageId</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>0</default>
                         </config>
                     </settings.bookPageId>
                     <settings.authorPageId>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.authorPageId</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>0</default>
                         </config>
                     </settings.authorPageId>
                     <settings.itemsPerPage>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.limit</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>5</default>
                         </config>
                     </settings.itemsPerPage>

diff --git a/Configuration/FlexForms/series.xml b/Configuration/FlexForms/series.xml
@@ -11,8 +11,7 @@
                     <settings.itemsPerPage>
                         <label>LLL:EXT:sf_books/Resources/Private/Language/locallang_be.xml:flexform.settings.limit</label>
                         <config type="array">
-                            <type>input</type>
-                            <eval>int</eval>
+                            <type>number</type>
                             <default>5</default>
                         </config>
                     </settings.itemsPerPage>

diff --git a/Documentation/guides.xml b/Documentation/guides.xml
@@ -16,8 +16,8 @@
                interlink-shortcode="evoweb/sf-books"
     />
     <project title="sf_books"
-             release="9.0.0"
-             version="9.0.0"
+             release="9.0.1"
+             version="9.0.1"
              copyright="since 2004 by evoWeb"
     />
     <inventory id="t3tsref" url="https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/"/>

diff --git a/Tests/Functional/AbstractTestCase.php b/Tests/Functional/AbstractTestCase.php
@@ -13,17 +13,6 @@
 
 namespace Evoweb\SfBooks\Tests\Functional;
 
-/**
- * This file is developed by evoWeb.
- *
- * 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.
- */
-
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;

diff --git a/Tests/Functional/Domain/Repository/AuthorRepositoryTest.php b/Tests/Functional/Domain/Repository/AuthorRepositoryTest.php
@@ -13,17 +13,6 @@
 
 namespace Evoweb\SfBooks\Tests\Functional\Domain\Repository;
 
-/**
- * This file is developed by evoWeb.
- *
- * 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.
- */
-
 use Evoweb\SfBooks\Domain\Model\Author;
 use Evoweb\SfBooks\Domain\Repository\AuthorRepository;
 use Evoweb\SfBooks\Tests\Functional\AbstractTestCase;
@@ -59,7 +48,7 @@ public function findByUidReturnsOneAuthor()
             'description' => $author->getDescription(),
             'capitalLetter' => $author->getCapitalLetter(),
         ];
-        self::assertEquals(
+        $this->assertEquals(
             [
                 'uid' => 1,
                 'pid' => 2,
@@ -86,7 +75,7 @@ public function findAuthorGroupedByLetters()
             'description' => $author->getDescription(),
             'capitalLetter' => $author->getCapitalLetter(),
         ];
-        self::assertEquals(
+        $this->assertEquals(
             [
                 'uid' => 1,
                 'pid' => 2,

diff --git a/Tests/Functional/Domain/Repository/SeriesRepositoryTest.php b/Tests/Functional/Domain/Repository/SeriesRepositoryTest.php
@@ -13,17 +13,6 @@
 
 namespace Evoweb\SfBooks\Tests\Functional\Domain\Repository;
 
-/**
- * This file is developed by evoWeb.
- *
- * 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.
- */
-
 use Evoweb\SfBooks\Domain\Model\Series;
 use Evoweb\SfBooks\Domain\Repository\SeriesRepository;
 use Evoweb\SfBooks\Tests\Functional\AbstractTestCase;
@@ -59,7 +48,7 @@ public function findByUidReturnsOneSeries()
             'description' => $series->getDescription(),
             'capitalLetter' => $series->getCapitalLetter(),
         ];
-        self::assertEquals(
+        $this->assertEquals(
             [
                 'uid' => 1,
                 'pid' => 2,
@@ -86,7 +75,7 @@ public function findSeriesGroupedByLetters()
             'description' => $series->getDescription(),
             'capitalLetter' => $series->getCapitalLetter(),
         ];
-        self::assertEquals(
+        $this->assertEquals(
             [
                 'uid' => 1,
                 'pid' => 2,

diff --git a/composer.json b/composer.json
@@ -24,16 +24,18 @@
 		}
 	},
 	"require": {
-		"typo3/cms-core": "^12.4 || 12.4.x-dev || ^13.0 || 13.0.x-dev || dev-main",
-		"typo3/cms-extbase": "^12.4 || 12.4.x-dev || ^13.0 || 13.0.x-dev || dev-main",
-		"typo3/cms-fluid": "^12.4 || 12.4.x-dev || ^13.0 || 13.0.x-dev || dev-main",
-		"typo3/cms-install": "^12.4 || 12.4.x-dev || ^13.0 || 13.0.x-dev || dev-main",
+		"typo3/cms-core": "^13.2 || 13.2.x-dev || dev-main",
+		"typo3/cms-extbase": "^13.2 || 13.2.x-dev || dev-main",
+		"typo3/cms-fluid": "^13.2 || 13.2.x-dev || dev-main",
+		"typo3/cms-install": "^13.2 || 13.2.x-dev || dev-main",
 		"psr/http-message": "^1.1 || ^2.0",
 		"doctrine/dbal": "^3.7.2 || ^4.0"
 	},
 	"require-dev": {
 		"friendsofphp/php-cs-fixer": "^3.57.1",
-		"typo3/testing-framework": "^8.0.2 || dev-main"
+		"typo3/testing-framework": "dev-main",
+		"phpunit/phpunit": "^11.3.1",
+		"webmozart/assert": "^1.11.0"
 	},
 	"extra": {
 		"typo3/cms": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -10,7 +10,7 @@
     'author_email' => '[email protected]',
     'author_company' => 'evoWeb',
     'state' => 'stable',
-    'version' => '9.0.0',
+    'version' => '9.0.1',
     'constraints' => [
         'depends' => [
             'typo3' => '13.4.0-13.4.99',