[TASK] Update nimut/testing-framework to 3.x

This pr: * Updates the testing framework to 3.x * Fixes issues in the tests that are related to the update Fixes: TYPO3-Solr#1823
timohund · Jan 31, 2018 · 66937a7 · 66937a7
1 parent 97e960c
commit 66937a7
Show file tree

Hide file tree

Showing 19 changed files with 255 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ services:
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 jdk:
   - oraclejdk8
@@ -26,15 +27,15 @@ env:
   matrix:
     - TYPO3_VERSION="^8.7"
     - TYPO3_VERSION="8.x-dev"
-    - TYPO3_VERSION="9.x-dev as 8.7.99"
+    - TYPO3_VERSION="^9.1"
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: TYPO3_VERSION="9.x-dev as 8.7.99"
-      php: 7.0
-    - env: TYPO3_VERSION="9.x-dev as 8.7.99"
-      php: 7.1
+  exclude:
+    - php: 7.0
+      env: TYPO3_VERSION="^9.1"
+    - php: 7.1
+      env: TYPO3_VERSION="^9.1"
 
 before_install:
   - composer self-update

diff --git a/Build/Test/bootstrap.sh b/Build/Test/bootstrap.sh
@@ -54,7 +54,20 @@ echo "Using package path $TYPO3_PATH_PACKAGES"
 echo "Using web path $TYPO3_PATH_WEB"
 
 # Install TYPO3 sources
-composer require --dev typo3/cms="$TYPO3_VERSION"
+if [[ $TYPO3_VERSION = *"9."* ]]; then
+    composer require --dev typo3/cms-backend="$TYPO3_VERSION"
+    composer require --dev typo3/cms-core="$TYPO3_VERSION"
+    composer require --dev typo3/cms-fluid="$TYPO3_VERSION"
+    composer require --dev typo3/cms-frontend="$TYPO3_VERSION"
+    composer require --dev typo3/cms-lang="$TYPO3_VERSION"
+    composer require --dev typo3/cms-extbase="$TYPO3_VERSION"
+    composer require --dev typo3/cms-extbase="$TYPO3_VERSION"
+    composer require --dev typo3/cms-reports="$TYPO3_VERSION"
+    composer require --dev typo3/cms-scheduler="$TYPO3_VERSION"
+    composer require --dev typo3/cms-tstemplate="$TYPO3_VERSION"
+else
+    composer require --dev typo3/cms="$TYPO3_VERSION"
+fi
 
 # Restore composer.json
 git checkout composer.json

diff --git a/Classes/Domain/Search/Query/QueryBuilder.php b/Classes/Domain/Search/Query/QueryBuilder.php
@@ -688,7 +688,7 @@ public function useFiltersFromTypoScript(): QueryBuilder
 
         $searchQueryFilters = $this->typoScriptConfiguration->getSearchQueryFilterConfiguration();
 
-        if (count($searchQueryFilters) <= 0) {
+        if (!is_array($searchQueryFilters) || count($searchQueryFilters) <= 0) {
             return $this;
         }
 
@@ -844,7 +844,7 @@ public function getAdditionalFilters() : array
         }
 
         $searchQueryFilters = $this->typoScriptConfiguration->getSearchQueryFilterConfiguration();
-        if (count($searchQueryFilters) <= 0) {
+        if (!is_array($searchQueryFilters) || count($searchQueryFilters) <= 0) {
             return [];
         }
 

diff --git a/Classes/System/Records/SystemDomain/SystemDomainRepository.php b/Classes/System/Records/SystemDomain/SystemDomainRepository.php
@@ -26,6 +26,7 @@
  ***************************************************************/
 
 use ApacheSolrForTypo3\Solr\System\Records\AbstractRepository;
+use ApacheSolrForTypo3\Solr\Util;
 
 class SystemDomainRepository extends AbstractRepository
 {
@@ -41,9 +42,34 @@ class SystemDomainRepository extends AbstractRepository
      * @return mixed
      */
     public function findDomainRecordsByRootPagesIds(array $rootPageIds = [])
+    {
+
+        if (Util::getIsTYPO3VersionBelow9()) {
+            //@todo this can be dropped when support of TYPO3 8 is dropped
+            $resultTmp = $this->getDomainRecordsByRootPageIdsFor8($rootPageIds);
+        } else {
+            $resultTmp = $this->getDomainRecordsByRootPageIdsFor9($rootPageIds);
+        }
+
+        $result = [];
+        foreach ($resultTmp as $key => $row) {
+            $result[$row['pid']] = $row;
+        }
+        return $result;
+    }
+
+    /**
+     * Fetches the domain records for TYPO3 8.
+     *
+     * @todo this can be dropped when support of TYPO3 8 is dropped
+     * @param array $rootPageIds
+     * @return array
+     */
+    protected function getDomainRecordsByRootPageIdsFor8(array $rootPageIds = [])
     {
         $queryBuilder = $this->getQueryBuilder();
-        $resultTmp = $queryBuilder->select('uid', 'pid')
+
+        return $queryBuilder->select('uid', 'pid')
             ->from($this->table)
             ->where(
                 $queryBuilder->expr()->in('pid', $rootPageIds),
@@ -52,11 +78,25 @@ public function findDomainRecordsByRootPagesIds(array $rootPageIds = [])
             ->orderBy('pid')
             ->addOrderBy('sorting')
             ->execute()->fetchAll();
+    }
 
-        $result = [];
-        foreach ($resultTmp as $key => $row) {
-            $result[$row['pid']] = $row;
-        }
-        return $result;
+    /**
+     * Fetches the domain records for TYPO3 9.
+     *
+     * @param array $rootPageIds
+     * @return array
+     */
+    protected function getDomainRecordsByRootPageIdsFor9(array $rootPageIds = [])
+    {
+        $queryBuilder = $this->getQueryBuilder();
+
+        return $queryBuilder->select('uid', 'pid')
+            ->from($this->table)
+            ->where(
+                $queryBuilder->expr()->in('pid', $rootPageIds)
+            )->groupBy('uid', 'pid', 'sorting')
+            ->orderBy('pid')
+            ->addOrderBy('sorting')
+            ->execute()->fetchAll();
     }
 }
diff --git a/Classes/ViewHelpers/Widget/FrequentlySearchedViewHelper.php b/Classes/ViewHelpers/Widget/FrequentlySearchedViewHelper.php
@@ -28,7 +28,7 @@ class FrequentlySearchedViewHelper extends AbstractWidgetViewHelper
 
     /**
      * @var \ApacheSolrForTypo3\Solr\ViewHelpers\Widget\Controller\FrequentlySearchedController
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $controller;
 

diff --git a/Classes/ViewHelpers/Widget/GroupItemPaginateViewHelper.php b/Classes/ViewHelpers/Widget/GroupItemPaginateViewHelper.php
@@ -36,7 +36,7 @@ class GroupItemPaginateViewHelper extends AbstractWidgetViewHelper
 
     /**
      * @var \ApacheSolrForTypo3\Solr\ViewHelpers\Widget\Controller\GroupItemPaginateController
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $controller;
 

diff --git a/Classes/ViewHelpers/Widget/LastSearchesViewHelper.php b/Classes/ViewHelpers/Widget/LastSearchesViewHelper.php
@@ -28,7 +28,7 @@ class LastSearchesViewHelper extends AbstractWidgetViewHelper
 
     /**
      * @var \ApacheSolrForTypo3\Solr\ViewHelpers\Widget\Controller\LastSearchesController
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $controller;
 

diff --git a/Classes/ViewHelpers/Widget/ResultPaginateViewHelper.php b/Classes/ViewHelpers/Widget/ResultPaginateViewHelper.php
@@ -36,7 +36,7 @@ class ResultPaginateViewHelper extends AbstractWidgetViewHelper
 
     /**
      * @var \ApacheSolrForTypo3\Solr\ViewHelpers\Widget\Controller\ResultPaginateController
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $controller;
 

diff --git a/Classes/Widget/AbstractWidgetViewHelper.php b/Classes/Widget/AbstractWidgetViewHelper.php
@@ -71,7 +71,7 @@ abstract class AbstractWidgetViewHelper extends AbstractCoreWidgetViewHelper imp
 
     /**
      * @var \TYPO3\CMS\Extbase\Service\ExtensionService
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $extensionService;
 

diff --git a/Tests/Integration/IntegrationTest.php b/Tests/Integration/IntegrationTest.php
@@ -258,6 +258,7 @@ protected function getConfiguredTSFE($TYPO3_CONF_VARS = [], $id = 1, $type = 0,
         /** @var $TSFE \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */
         $TSFE = GeneralUtility::makeInstance(TypoScriptFrontendController::class,
             $TYPO3_CONF_VARS, $id, $type, $no_cache, $cHash, $_2, $MP, $RDCT);
+        $GLOBALS['TSFE'] = $TSFE;
 
 
         EidUtility::initLanguage();

diff --git a/Tests/Integration/Report/Fixtures/can_detect_indexing_disabled.v9.xml b/Tests/Integration/Report/Fixtures/can_detect_indexing_disabled.v9.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <sys_registry>
+        <uid>4711</uid>
+        <entry_namespace>tx_solr</entry_namespace>
+        <entry_key>servers</entry_key>
+        <entry_value>a:1:{s:3:"1|0";a:9:{s:13:"connectionKey";s:3:"1|0";s:13:"rootPageTitle";s:15:"Congratulations";s:11:"rootPageUid";s:1:"1";s:10:"solrScheme";s:4:"http";s:8:"solrHost";s:9:"localhost";s:8:"solrPort";s:4:"8999";s:8:"solrPath";s:14:"/solr/core_en/";s:8:"language";i:0;s:5:"label";s:74:"Congratulations (pid: 1, language: default) - localhost:8999/solr/core_en/";}}</entry_value>
+    </sys_registry>
+
+    <sys_template>
+        <uid>1</uid>
+        <pid>1</pid>
+        <root>1</root>
+        <clear>3</clear>
+        <config>
+            <![CDATA[
+                page = PAGE
+                page.typeNum = 0
+                page.bodyTag = <body>
+
+                config.index_enable = 0
+
+                plugin.tx_solr {
+                    enabled = 1
+                    solr {
+                        scheme = http
+                        host   = localhost
+                        port   = 8999
+                        path   = /solr/core_en/
+                    }
+                }
+            ]]>
+        </config>
+        <sorting>100</sorting>
+    </sys_template>
+    <pages>
+        <uid>1</uid>
+        <is_siteroot>1</is_siteroot>
+        <doktype>1</doktype>
+        <title>Hello Search Test</title>
+    </pages>
+    <sys_domain>
+        <uid>1</uid>
+        <pid>1</pid>
+        <domainName>localhost</domainName>
+        <hidden>0</hidden>
+        <sorting>100</sorting>
+    </sys_domain>
+</dataset>
diff --git a/Tests/Integration/Report/Fixtures/can_detect_missing_rootpage.v9.xml b/Tests/Integration/Report/Fixtures/can_detect_missing_rootpage.v9.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <sys_registry>
+        <uid>4711</uid>
+        <entry_namespace>tx_solr</entry_namespace>
+        <entry_key>servers</entry_key>
+        <entry_value>a:1:{s:3:"1|0";a:9:{s:13:"connectionKey";s:3:"1|0";s:13:"rootPageTitle";s:15:"Congratulations";s:11:"rootPageUid";s:1:"1";s:10:"solrScheme";s:4:"http";s:8:"solrHost";s:9:"localhost";s:8:"solrPort";s:4:"8999";s:8:"solrPath";s:14:"/solr/core_en/";s:8:"language";i:0;s:5:"label";s:74:"Congratulations (pid: 1, language: default) - localhost:8999/solr/core_en/";}}</entry_value>
+    </sys_registry>
+
+    <sys_template>
+        <uid>1</uid>
+        <pid>1</pid>
+        <root>1</root>
+        <clear>3</clear>
+        <config>
+            <![CDATA[
+                page = PAGE
+                page.typeNum = 0
+                page.bodyTag = <body>
+
+                config.index_enable = 1
+
+                plugin.tx_solr {
+                    enabled = 1
+                    solr {
+                        scheme = http
+                        host   = localhost
+                        port   = 8999
+                        path   = /solr/core_en/
+                    }
+                }
+            ]]>
+        </config>
+        <sorting>100</sorting>
+    </sys_template>
+    <sys_domain>
+        <uid>1</uid>
+        <pid>1</pid>
+        <domainName>localhost</domainName>
+        <hidden>0</hidden>
+        <sorting>100</sorting>
+    </sys_domain>
+</dataset>
diff --git a/Tests/Integration/Report/Fixtures/can_get_green_solr_configuration_status_report.v9.xml b/Tests/Integration/Report/Fixtures/can_get_green_solr_configuration_status_report.v9.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <sys_registry>
+        <uid>4711</uid>
+        <entry_namespace>tx_solr</entry_namespace>
+        <entry_key>servers</entry_key>
+        <entry_value>a:1:{s:3:"1|0";a:9:{s:13:"connectionKey";s:3:"1|0";s:13:"rootPageTitle";s:15:"Congratulations";s:11:"rootPageUid";s:1:"1";s:10:"solrScheme";s:4:"http";s:8:"solrHost";s:9:"localhost";s:8:"solrPort";s:4:"8999";s:8:"solrPath";s:14:"/solr/core_en/";s:8:"language";i:0;s:5:"label";s:74:"Congratulations (pid: 1, language: default) - localhost:8999/solr/core_en/";}}</entry_value>
+    </sys_registry>
+
+    <sys_template>
+        <uid>1</uid>
+        <pid>1</pid>
+        <root>1</root>
+        <clear>3</clear>
+        <config>
+            <![CDATA[
+                page = PAGE
+                page.typeNum = 0
+                page.bodyTag = <body>
+
+                config.index_enable = 1
+
+                plugin.tx_solr {
+                    enabled = 1
+                    solr {
+                        scheme = http
+                        host   = localhost
+                        port   = 8999
+                        path   = /solr/core_en/
+                    }
+                }
+            ]]>
+        </config>
+        <sorting>100</sorting>
+    </sys_template>
+    <pages>
+        <uid>1</uid>
+        <is_siteroot>1</is_siteroot>
+        <doktype>1</doktype>
+        <title>Hello Search Test</title>
+    </pages>
+    <sys_domain>
+        <uid>1</uid>
+        <pid>1</pid>
+        <domainName>localhost</domainName>
+        <hidden>0</hidden>
+        <sorting>100</sorting>
+    </sys_domain>
+</dataset>
diff --git a/Tests/Integration/System/Records/SystemDomain/Fixtures/sys_domain.v9.xml b/Tests/Integration/System/Records/SystemDomain/Fixtures/sys_domain.v9.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    <sys_domain>
+        <uid>17</uid>
+        <pid>24</pid>
+        <domainName>localhost</domainName>
+        <hidden>0</hidden>
+        <sorting>100</sorting>
+    </sys_domain>
+</dataset>