Commit 0142d830 authored by Tomas Norre Mikkelsen's avatar Tomas Norre Mikkelsen

Merge branch 'composer-requirements-update' into 'develop'

[TASK] Update ext:typo3_console, ext:solr, ext:secure_web

See merge request !428
parents 85f4ffe2 eef1def2
Pipeline #7439 passed with stages
in 4 minutes and 3 seconds
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b31ee86f004064dc06d51da8e2a3bfc3",
"content-hash": "fb420ddb088c608e04d07c5db1ef6e31",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -93,35 +93,42 @@
},
{
"name": "apache-solr-for-typo3/solr",
"version": "7.5.3",
"version": "9.0.2",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Solr/ext-solr.git",
"reference": "1aa80c4c9b9fdb061616ae16d2059a9f76d2588d"
"reference": "628b3faa22dfa95ce563caf73e8549960e9a667c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Solr/ext-solr/zipball/1aa80c4c9b9fdb061616ae16d2059a9f76d2588d",
"reference": "1aa80c4c9b9fdb061616ae16d2059a9f76d2588d",
"url": "https://api.github.com/repos/TYPO3-Solr/ext-solr/zipball/628b3faa22dfa95ce563caf73e8549960e9a667c",
"reference": "628b3faa22dfa95ce563caf73e8549960e9a667c",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
"typo3/cms-core": ">=8.7.0"
"solarium/solarium": "~4.2.0",
"typo3/cms-backend": "^8.7.0 || ^9.5.0",
"typo3/cms-core": "^8.7.0 || ^9.5.0",
"typo3/cms-extbase": "^8.7.0 || ^9.5.0",
"typo3/cms-fluid": "^8.7.0 || ^9.5.0",
"typo3/cms-frontend": "^8.7.0 || ^9.5.0",
"typo3/cms-reports": "^8.7.0 || ^9.5.0",
"typo3/cms-scheduler": "^8.7.0 || ^9.5.0",
"typo3/cms-tstemplate": "^8.7.0 || ^9.5.0"
},
"replace": {
"apache-solr-for-typo3/solrfluid": "*",
"solr": "self.version",
"typo3-ter/solr": "self.version"
},
"require-dev": {
"nimut/testing-framework": "^1.1",
"phpunit/phpunit": "^5.6"
"nimut/testing-framework": "^4.0.0",
"phpunit/phpunit": "^6.0"
},
"type": "typo3-cms-extension",
"extra": {
"branch-alias": {
"dev-master": "7.5.x-dev"
"dev-master": "9.0.x-dev"
},
"typo3/cms": {
"extension-key": "solr",
......@@ -156,7 +163,7 @@
"solr",
"typo3"
],
"time": "2018-09-27T15:09:59+00:00"
"time": "2019-03-06T12:19:56+00:00"
},
{
"name": "causal/ig_ldap_sso_auth",
......@@ -1273,54 +1280,53 @@
},
{
"name": "helhum/typo3-console",
"version": "5.6.0",
"version": "v5.7.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9"
"reference": "433fe6b3d1bd5760b0d9fb90fc486f8fd56a4a34"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/5e4ce3c116685a9929e033d3032d502658e543e9",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/433fe6b3d1bd5760b0d9fb90fc486f8fd56a4a34",
"reference": "433fe6b3d1bd5760b0d9fb90fc486f8fd56a4a34",
"shasum": ""
},
"require": {
"doctrine/annotations": "^1.4",
"helhum/config-loader": ">=0.9 <0.12",
"helhum/config-loader": ">=0.9 <0.13",
"helhum/typo3-console-plugin": "^2.0.2",
"php": ">=7.0.0 <7.3",
"php": ">=7.0.0 <7.4",
"symfony/console": "^3.4.4 || ^4.0",
"symfony/process": "^3.4.4 || ^4.0",
"typo3/cms-backend": "~8.7.10 || ~9.5.0",
"typo3/cms-core": "~8.7.10 || ~9.5.0",
"typo3/cms-extbase": "~8.7.10 || ~9.5.0",
"typo3/cms-extensionmanager": "~8.7.10 || ~9.5.0",
"typo3/cms-fluid": "~8.7.10 || ~9.5.0",
"typo3/cms-frontend": "~8.7.10 || ~9.5.0",
"typo3/cms-install": "~8.7.10 || ~9.5.0",
"typo3/cms-backend": "~8.7.22 || ~9.5.0",
"typo3/cms-core": "~8.7.22 || ~9.5.0",
"typo3/cms-extbase": "~8.7.22 || ~9.5.0",
"typo3/cms-extensionmanager": "~8.7.22 || ~9.5.0",
"typo3/cms-fluid": "~8.7.22 || ~9.5.0",
"typo3/cms-frontend": "~8.7.22 || ~9.5.0",
"typo3/cms-install": "~8.7.22 || ~9.5.0",
"typo3/cms-saltedpasswords": "*",
"typo3/cms-scheduler": "~8.7.10 || ~9.5.0"
"typo3/cms-scheduler": "~8.7.22 || ~9.5.0"
},
"conflict": {
"friendsoftypo3/dbal": "*",
"typo3-ter/dbal": "*"
},
"replace": {
"typo3-ter/typo3-console": "self.version",
"typo3_console": "self.version"
"typo3-ter/typo3-console": "self.version"
},
"require-dev": {
"cweagans/composer-patches": "^1.6",
"doctrine/dbal": "< 2.8",
"jakub-onderka/php-parallel-lint": "^1.0",
"nimut/testing-framework": "dev-master",
"nimut/testing-framework": "dev-allow-php73",
"symfony/filesystem": "^3.2",
"typo3-console/convert-command-controller-command": "@dev",
"typo3-console/create-reference-command": "@dev",
"typo3-console/php-server-command": "^0.2",
"typo3/cms-filemetadata": "~8.7.10 || ~9.5.0 || dev-master",
"typo3/cms-reports": "~8.7.10 || ~9.5.0 || dev-master"
"typo3/cms-filemetadata": "~8.7.22 || ~9.5.0 || dev-master",
"typo3/cms-reports": "~8.7.22 || ~9.5.0 || dev-master"
},
"bin": [
"typo3cms"
......@@ -1332,10 +1338,7 @@
},
"typo3/cms": {
"app-dir": ".Build",
"web-dir": ".Build/public",
"Package": {
"partOfMinimalUsableSystem": true
}
"web-dir": ".Build/public"
}
},
"autoload": {
......@@ -1367,7 +1370,7 @@
"console",
"typo3"
],
"time": "2018-10-21T21:10:17+00:00"
"time": "2019-07-17T09:02:54+00:00"
},
{
"name": "helhum/typo3-console-plugin",
......@@ -1424,16 +1427,16 @@
},
{
"name": "helhum/typo3-secure-web",
"version": "v0.2.8",
"version": "v0.2.9",
"source": {
"type": "git",
"url": "https://github.com/helhum/typo3-secure-web.git",
"reference": "c3530fda74affbae6d5a09c62335d128a735c69c"
"reference": "da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/typo3-secure-web/zipball/c3530fda74affbae6d5a09c62335d128a735c69c",
"reference": "c3530fda74affbae6d5a09c62335d128a735c69c",
"url": "https://api.github.com/repos/helhum/typo3-secure-web/zipball/da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393",
"reference": "da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393",
"shasum": ""
},
"require": {
......@@ -1463,18 +1466,18 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Helmut Hummel",
"role": "Developer",
"email": "info@helhum.io",
"homepage": "https://helhum.io",
"role": "Developer"
"homepage": "https://helhum.io"
}
],
"description": "Set up secure TYPO3 web directory containing only public assets",
"time": "2018-12-16T12:14:08+00:00"
"time": "2019-05-30T15:24:17+00:00"
},
{
"name": "monolog/monolog",
......@@ -1791,6 +1794,64 @@
"description": "A polyfill for getallheaders.",
"time": "2016-02-11T07:05:27+00:00"
},
{
"name": "solarium/solarium",
"version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/solariumphp/solarium.git",
"reference": "20cf9e906a4e8e4a29c1ff48a2b145fa31d1064d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/solariumphp/solarium/zipball/20cf9e906a4e8e4a29c1ff48a2b145fa31d1064d",
"reference": "20cf9e906a4e8e4a29c1ff48a2b145fa31d1064d",
"shasum": ""
},
"require": {
"php": "^7.0",
"symfony/event-dispatcher": "^2.7 || ^3.0 || ^4.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^3.8 || ^6.2",
"php-coveralls/php-coveralls": "^1.0",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^1.4",
"zendframework/zendframework": "^3.0"
},
"suggest": {
"minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1.x-dev"
}
},
"autoload": {
"psr-4": {
"Solarium\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "See GitHub contributors",
"homepage": "https://github.com/basdenooijer/solarium/contributors"
}
],
"description": "PHP Solr client",
"homepage": "http://www.solarium-project.org",
"keywords": [
"php",
"search",
"solr"
],
"time": "2018-11-24T09:20:30+00:00"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.12",
......@@ -2044,6 +2105,134 @@
"homepage": "https://symfony.com",
"time": "2018-12-02T15:50:25+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "212b020949331b6531250584531363844b34a94e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e",
"reference": "212b020949331b6531250584531363844b34a94e",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/event-dispatcher-contracts": "^1.1"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/http-foundation": "^3.4|^4.0",
"symfony/service-contracts": "^1.1",
"symfony/stopwatch": "~3.4|~4.0"
},
"suggest": {
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2019-06-27T06:42:14+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v1.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "c61766f4440ca687de1084a5c00b08e167a2575c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c",
"reference": "c61766f4440ca687de1084a5c00b08e167a2575c",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"suggest": {
"psr/event-dispatcher": "",
"symfony/event-dispatcher-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Contracts\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Generic abstractions related to dispatching event",
"homepage": "https://symfony.com",
"keywords": [
"abstractions",
"contracts",
"decoupling",
"interfaces",
"interoperability",
"standards"
],
"time": "2019-06-20T06:46:26+00:00"
},
{
"name": "symfony/finder",
"version": "v3.4.28",
......
......@@ -15,6 +15,7 @@ namespace T3o\TerFe2\Solr\IndexQueue;
*/
use ApacheSolrForTypo3\Solr\IndexQueue\Item;
use ApacheSolrForTypo3\Solr\System\Solr\Document\Document;
use T3o\TerFe2\Utility\VersionUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
......@@ -55,14 +56,14 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer
*
* @param Item $item An index queue item
* @param int $language Language Id
* @return \Apache_Solr_Document The Solr document converted from the record
* @return \ApacheSolrForTypo3\Solr\System\Solr\Document\Document The Solr document converted from the record
*/
protected function itemToDocument(Item $item, $language = 0)
protected function itemToDocument(Item $item, $language = 0): Document
{
$document = null;
$itemRecord = $this->getFullItemRecord($item, $language);
if (!is_null($itemRecord)) {
if ($itemRecord !== null) {
$itemIndexingConfiguration = $this->getItemTypeConfiguration(
$item,
$language
......@@ -77,11 +78,11 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer
}
/**
* @param \Apache_Solr_Document $document
* @param \ApacheSolrForTypo3\Solr\System\Solr\Document\Document $document
* @param array $itemRecord
* @return \Apache_Solr_Document
* @return \ApacheSolrForTypo3\Solr\System\Solr\Document\Document
*/
public function addSpecialFields(\Apache_Solr_Document $document, array $itemRecord)
public function addSpecialFields(Document $document, array $itemRecord): Document
{
$extension = $this->extensionRepository->findByUid($itemRecord['uid']);
......
......@@ -18,3 +18,11 @@ plugin.tx_ter_pi1.wsdlNamespace = https://extensions.typo3.org/wsdl/tx_ter/
[applicationContext = Production/Stage]
plugin.tx_ter_pi1.wsdlNamespace = https://extensions-stage.typo3.org/wsdl/tx_ter/
[global]
plugin.tx_solr {
view {
templateRootPath = EXT:ter_layout/Resources/Private/Templates/Solr/
partialRootPath = EXT:ter_layout/Resources/Private/Partials/Solr/
layoutRootPath = EXT:ter_layout/Resources/Private/Layouts/Solr/
}
}
plugin.tx_solr {
view {
layoutRootPaths {
0 = EXT:solr/Resources/Private/Layouts
}
partialRootPaths {
0 = EXT:solr/Resources/Private/Partials
100 = EXT:ter_layout/Resources/Private/Partials/Solr/
}
templateRootPaths {
0 = EXT:solr/Resources/Private/Templates
100 = EXT:ter_layout/Resources/Private/Templates/Solr/
}
}
search {
ignoreGlobalQParameter = 1
query {
......
<div class="tx_solr">
<div class="row">
<div class="col-md-12">
<f:render section="content" />
</div>
</div>
</div>
......@@ -6,7 +6,7 @@
<div id="tx-solr-faceting" class="d-none d-lg-block d-xl-block">
<div class="card-container">
<f:if condition="{resultSet.facets.used -> f:count()}">
<div class="card card-size-large" id="tx-solr-facets-in-use">
<div class="card card-size-large mb-3" id="tx-solr-facets-in-use">
<div class="card-header">
<s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate>
</div>
......@@ -24,7 +24,7 @@
</ul>
</div>
<div class="">
<a href="{s:uri.facet.removeAllFacets()}" class="btn btn-primary btn-block solr-ajaxified">
<a href="{s:uri.facet.removeAllFacets()}" class="btn btn-primary btn-block solr-ajaxified mb-0">
<strong><i class="fa fa-times"></i>
<s:translate key="faceting_removeAllFilters">Remove all filters</s:translate>
</strong>
......@@ -37,7 +37,7 @@
<div class="facet-area-main">
<div class="solr-facets-available secondaryContentSection">
<f:for each="{areaFacets}" as="facet">
<div class="card card-size-large">
<div class="card card-size-large mb-3">
<f:render partial="Facets/{facet.partialName}" arguments="{resultSet:resultSet, facet:facet}" />
</div>
</f:for>
......
......@@ -2,14 +2,14 @@
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
<f:layout name="Main" />
<f:layout name="Fullwidth" />
<f:section name="main">
<f:section name="content">
<div class="container-fluid">
<f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" />
<f:if condition="{resultSet.usedSearch.numberOfResults}">
<f:if condition="{resultSet.allResultCount}">
<f:else>
<div class="alert alert-danger mt-3">
<s:translate key="no_results_nothing_found" arguments="{0: resultSet.usedQuery.queryString}">Nothing found for "%s".</s:translate>
......@@ -41,10 +41,10 @@
</f:then>
</f:if>
<f:if condition="{hasSearched}">
<f:if condition="{resultSet.hasSearched}">
<s:widget.resultPaginate resultSet="{resultSet}" configuration="{maximumNumberOfLinks: settings.maximumNumberOfLinks, templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}">
<f:variable name="exactMatchFound" value="0" />
<f:if condition="{resultSet.usedQuery.queryString -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}">
<f:if condition="{resultSet.usedQuery.options.query -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}">
<f:render partial="Result/Document" section="DocumentWrap" arguments="{resultSet:resultSet, document:documents.0, exactMatchFound: 1}" />
<f:variable name="exactMatchFound" value="1" />
</f:if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment