Skip to content

Commit 9f4ca51

Browse files
committed
Release 10.0.0
This is the maintenance release only. As we're planning to simplify the extension and dependency handling we're harmonize the extension version with TYPO3. So the next version of solrmlt is 10.0.0 and compatible with TYPO3 10 LTS and EXT:solr 11.1.0. Please read the release notes: https://github.com/TYPO3-Solr/ext-solrfluidgrouping/releases/tag/10.0.0
1 parent bbe6f42 commit 9f4ca51

File tree

4 files changed

+77
-16
lines changed

4 files changed

+77
-16
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, release-10.0.x ]
66
tags:
77
- "**"
88
pull_request:
9-
branches: [ master ]
9+
branches: [ master, release-10.0.x ]
1010

1111
env:
1212
EXT_SOLR_VERSION: 'dev-release-11.1.x'
@@ -28,10 +28,8 @@ jobs:
2828
runs-on: ubuntu-latest
2929
strategy:
3030
matrix:
31-
# PHP: [ '7.2', '7.3', '7.4' ]
32-
# TYPO3: [ '^10.4', '10.4.x-dev' ]
33-
PHP: [ '7.4' ]
34-
TYPO3: [ '10.4.x-dev' ]
31+
PHP: [ '7.2', '7.3', '7.4' ]
32+
TYPO3: [ '^10.4', '10.4.x-dev' ]
3533
env:
3634
TYPO3_VERSION: ${{ matrix.TYPO3 }}
3735

@@ -91,13 +89,13 @@ jobs:
9189
./Build/Test/cibuild.sh
9290
echo "Current Size of EXT:solrmlt build Artefacts: " && du -sh $CI_BUILD_DIRECTORY/ && du -sh $CI_BUILD_DIRECTORY/ext-solrmlt/.Build/*
9391
94-
- name: Upload code coverage to Scrutinizer
95-
run: |
96-
cd $CI_BUILD_DIRECTORY/ext-solrmlt
97-
mkdir -p $GITHUB_WORKSPACE/bin
98-
wget https://scrutinizer-ci.com/ocular.phar -O $GITHUB_WORKSPACE/bin/ocular && chmod +x $GITHUB_WORKSPACE/bin/ocular
99-
php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.unit.clover
100-
[ -f coverage.integration.clover ] && php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.integration.clover
92+
# - name: Upload code coverage to Scrutinizer
93+
# run: |
94+
# cd $CI_BUILD_DIRECTORY/ext-solrmlt
95+
# mkdir -p $GITHUB_WORKSPACE/bin
96+
# wget https://scrutinizer-ci.com/ocular.phar -O $GITHUB_WORKSPACE/bin/ocular && chmod +x $GITHUB_WORKSPACE/bin/ocular
97+
# php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.unit.clover
98+
# [ -f coverage.integration.clover ] && php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.integration.clover
10199

102100
publish:
103101
name: Publish new version to TER

.scrutinizer.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
filter:
2+
excluded_paths:
3+
- 'Documentation/*'
4+
- 'Tests/*'
5+
- 'Resources/Public/JavaScript/*'
6+
paths:
7+
- 'Classes/*'
8+
- 'Configuration/*'
9+
dependency_paths:
10+
- ".Build/vendor"
11+
12+
tools:
13+
php_cpd:
14+
enabled: true
15+
16+
php_code_sniffer:
17+
enabled: true
18+
config:
19+
standard: TYPO3CMS
20+
21+
# we do this on GitHub actions
22+
php_cs_fixer:
23+
enabled: false
24+
25+
php_mess_detector:
26+
enabled: true
27+
config:
28+
controversial_rules:
29+
superglobals: false
30+
31+
php_pdepend:
32+
enabled: true
33+
34+
php_analyzer:
35+
enabled: true
36+
37+
external_code_coverage:
38+
runs: 2
39+
timeout: 2400
40+
41+
checks:
42+
php:
43+
excluded_dependencies:
44+
- typo3/cms-install
45+
avoid_superglobals: false
46+
47+
build:
48+
environment:
49+
# We want to test with the smallest supported by TYPO3 PHP version
50+
php: 7.2
51+
dependencies:
52+
override:
53+
- composer install --dev --no-interaction --no-scripts
54+
nodes:
55+
analysis:
56+
dependencies:
57+
after:
58+
- composer require --dev squizlabs/php_codesniffer:^3.6
59+
# tests:
60+
# override:
61+
# - php-scrutinizer-run
62+
# - command: phpcs-run
63+
# use_website_config: false

Classes/Query/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ protected function applyFrontendRestrictions(SearchQuery $query, TypoScriptFront
119119
* @param TypoScriptFrontendController $TSFE
120120
* @return string
121121
*/
122-
protected function getSiteHashFilterForTSFE(TypoScriptFrontendController $TSFE)
122+
protected function getSiteHashFilterForTSFE(TypoScriptFrontendController $TSFE): string
123123
{
124-
/** @var $siteRepository SiteRepository */
124+
/* @var SiteRepository $siteRepository */
125125
$siteRepository = GeneralUtility::makeInstance(SiteRepository::class);
126126
return "siteHash:".$siteRepository->getSiteByPageId($TSFE->id)->getSiteHash();
127127
}

ext_emconf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'constraints' => [
1717
'depends' => [
1818
'solr' => '11.1.0-',
19-
'typo3' => '10.4.10-',
19+
'typo3' => '10.4.10-10.4.99',
2020
],
2121
'conflicts' => [],
2222
'suggests' => [],

0 commit comments

Comments
 (0)