[TASK] Prepare version 2.1.0

This commit contains:

* Set version to 2.1.0
* Adapt travis setup to test against TYPO3 9 and 10
* Update the compatible TYPO3 versions in ext_emconf.php

Author: Timo Hund

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 sudo: true
 
@@ -17,36 +17,22 @@ env:
     - TYPO3_DATABASE_HOST="localhost"
     - TYPO3_DATABASE_USERNAME="root"
     - TYPO3_DATABASE_PASSWORD=""
-    - EXT_SOLR_VERSION="dev-release-9.0.x"
+    - EXT_SOLR_VERSION="dev-release-11.0.x"
   matrix:
-    - TYPO3_VERSION="^8.7.0"
     - TYPO3_VERSION="^9.5.0"
+    - TYPO3_VERSION="^10.4.0"
     - TYPO3_VERSION="dev-master"
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: TYPO3_VERSION="dev-master"
-      php: 7.2
-    - env: TYPO3_VERSION="dev-master"
-      php: 7.1
-    - env: TYPO3_VERSION="dev-master"
-      php: 7.0
   exclude:
-    - php: 7.0
-      env: TYPO3_VERSION="^9.5.0"
-    - php: 7.1
-      env: TYPO3_VERSION="^9.5.0"
-    - php: 7.1
-      env: TYPO3_VERSION="dev-master"
-    - php: 7.0
-      env: TYPO3_VERSION="dev-master"
 
 before_install:
   - composer self-update
   - composer --version
   - composer global require fabpot/php-cs-fixer
-  - composer global require namelesscoder/typo3-repository-client
 
 install:
   - Build/Test/bootstrap.sh

Build/Test/bootstrap.sh

@@ -53,13 +53,7 @@ echo "Using extension path $EXTENSION_ROOTPATH"
 echo "Using package path $TYPO3_PATH_PACKAGES"
 echo "Using web path $TYPO3_PATH_WEB"
 
-if [[ $TYPO3_VERSION = *"master"*  || $TYPO3_VERSION = *"9"* ]]; then
-    composer require --dev --update-with-dependencies typo3/cms-core="$TYPO3_VERSION" typo3/cms-backend="$TYPO3_VERSION" typo3/cms-fluid="$TYPO3_VERSION" typo3/cms-frontend="$TYPO3_VERSION" typo3/cms-extbase="$TYPO3_VERSION" typo3/cms-reports="$TYPO3_VERSION" typo3/cms-scheduler="$TYPO3_VERSION" typo3/cms-tstemplate="$TYPO3_VERSION"
-else
-    composer require --dev typo3/cms="$TYPO3_VERSION"
-fi
-
-composer require --dev apache-solr-for-typo3/solr="$EXT_SOLR_VERSION"
+composer require --dev --update-with-dependencies typo3/cms-core="$TYPO3_VERSION" typo3/cms-backend="$TYPO3_VERSION" typo3/cms-fluid="$TYPO3_VERSION" typo3/cms-frontend="$TYPO3_VERSION" typo3/cms-extbase="$TYPO3_VERSION" typo3/cms-reports="$TYPO3_VERSION" typo3/cms-scheduler="$TYPO3_VERSION" typo3/cms-tstemplate="$TYPO3_VERSION"  apache-solr-for-typo3/solr="$EXT_SOLR_VERSION"
 
 # Restore composer.json
 git checkout composer.json

Documentation/Settings.cfg

@@ -1,8 +1,8 @@
 [general]
 
 project     = ApacheSolrForTypo3 EXT:solrfluidgrouping
-version     = 2.0.0
-release     = 2.0.0
+version     = 2.1.0
+release     = 2.1.0
 t3author    = Timo Hund
 copyright   = 2019
 

Documentation/Settings.yml

@@ -6,8 +6,8 @@
 conf.py:
   copyright: 2019
   project: Documentation for EXT:solrfluidgrouping grouping for solr results
-  version: 2.0.0
-  release: 2.0.0
+  version: 2.1.0
+  release: 2.1.0
   extensions:
     - sphinx.ext.intersphinx
     - t3sphinx.ext.t3extras

Documentation/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.0'
+version = '2.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0'
+release = '2.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Tests/Unit/Domain/Search/ResultSet/SearchResultSetServiceTest.php

@@ -16,6 +16,7 @@
 
 use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Grouping\Group;
 use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Result\Parser\ResultParserRegistry;
+use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSet;
 use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSetService;
 use ApacheSolrForTypo3\Solr\Domain\Search\SearchRequest;
 use ApacheSolrForTypo3\Solr\Search;
@@ -24,6 +25,8 @@
 use ApacheSolrForTypo3\Solr\Tests\Unit\UnitTest;
 use ApacheSolrForTypo3\Solrfluidgrouping\Domain\Search\ResultSet\Grouping\Parser\GroupedResultParser;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 
 /**
  * This processor is used to transform the solr response into a
@@ -81,12 +84,20 @@ public function canCreateGroups()
 
             /** @var $searchResultSetService SearchResultSetService */
         $searchResultSetService = $this->getMockBuilder(SearchResultSetService::class)->setMethods(['doASearch'])->setConstructorArgs([$typoScriptConfiguration, $searchMock])->getMock();
+        $objectManagerMock = $this->getDumbMock(ObjectManagerInterface::class);
+
+        $searchResultSet =  new SearchResultSet();
+        $objectManagerMock->expects($this->once())->method('get')->willReturn($searchResultSet);
+
+        $searchResultSetService->injectObjectManager($objectManagerMock);
         $searchResultSetService->expects($this->once())->method('doASearch')->will($this->returnValue($fakeResponse));
 
         $fakeRequest = $this->getDumbMock(SearchRequest::class);
         $fakeRequest->expects($this->any())->method('getResultsPerPage')->willReturn(10);
         $fakeRequest->expects($this->any())->method('getContextTypoScriptConfiguration')->will($this->returnValue($typoScriptConfiguration));
         $fakeRequest->expects($this->any())->method('getAdditionalFilters')->willReturn([]);
+        $searchResultSet->setUsedSearchRequest($fakeRequest);
+
         $searchResultSet = $searchResultSetService->search($fakeRequest);
 
         $this->assertSame(1, $searchResultSet->getSearchResults()->getGroups()->getCount(), 'There should be 1 Groups of search results');

composer.json

@@ -23,14 +23,11 @@
   },
   "require": {
     "php": ">=7.0.0",
-    "typo3/cms-core": ">=8.7.0"
+    "typo3/cms-core": ">=9.5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.0.0",
-    "nimut/testing-framework": "^4.0.0"
-  },
-  "replace": {
-    "typo3-ter/solrfluidgrouping": "self.version"
+    "phpunit/phpunit": "^6.0 || ^7.5.6 || ^8",
+    "nimut/testing-framework": "^5.0.0"
   },
   "autoload": {
     "psr-4": {
@@ -57,14 +54,11 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "2.0.x-dev"
+      "dev-master": "2.1.x-dev"
     },
     "typo3/cms": {
       "cms-package-dir": "{$vendor-dir}/typo3/cms",
       "web-dir": ".Build/Web"
-    },
-    "typo3/class-alias-loader": {
-      "always-add-alias-loader": true
     }
   }
 }

ext_emconf.php

@@ -2,7 +2,7 @@
 $EM_CONF[$_EXTKEY] = array(
     'title' => 'Apache Solr for TYPO3 - Grouping for fluid rendering',
     'description' => 'This addon provides the grouping for the fluid templating',
-    'version' => '2.0.0',
+    'version' => '2.1.0',
     'state' => 'stable',
     'category' => 'plugin',
     'author' => 'Timo Hund, Frans Saris',
@@ -17,14 +17,11 @@
         'depends' => array(
             'scheduler' => '',
             'solr' => '9.0.0-',
-            'extbase' => '8.7.0-9.5.99',
-            'fluid' => '8.7.0-9.5.99',
-            'typo3' => '8.7.0-9.5.99'
+            'extbase' => '8.7.0-10.4.99',
+            'fluid' => '8.7.0-10.4.99',
+            'typo3' => '8.7.0-10.4.99'
         ),
         'conflicts' => array(),
-        'suggests' => array(
-            'devlog' => '',
-        ),
     ),
     'autoload' => array(
         'psr-4' => array(