From 4fe60597bcb603565ba7813369eea2e07e3aabac Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 30 Nov 2023 19:08:45 +0100 Subject: [PATCH] add 7.1.6.2 (sourceGuardian for PHP 8) --- composer.json | 2 +- docs/daux/changelog/010_Changelog.md | 16 ++++- docs/daux/config.json | 4 +- docs/html/changelog/Changelog.html | 24 ++++++-- docs/html/editions/Editionen.html | 2 +- docs/html/index.html | 4 +- .../Kompatibilitaet_mit_anderen_Modulen.html | 2 +- .../Anforderungen/Systemanforderungen.html | 2 +- .../Anforderungen/Vorbereitungen.html | 2 +- .../Deinstallation/Dateien_loeschen.html | 2 +- .../Deinstallation/Datenbank_bereinigen.html | 2 +- .../Modul_aus_der_Installation_entfernen.html | 2 +- .../Deinstallation/Modul_deaktivieren.html | 2 +- ...eiterungen_deaktivieren_und_entfernen.html | 2 +- .../Deinstallation/TMP-Ordner_leeren.html | 2 +- docs/html/installation/Installation.html | 2 +- .../Cachevermeidung.html | 2 +- .../installation/Installationspruefung.html | 2 +- .../Neuinstallation/Cronjob_einrichten.html | 2 +- .../Neuinstallation/Lizenz_eintragen.html | 2 +- .../Neuinstallation/Modul_hinzufuegen.html | 4 +- .../Modul_im_Shop_aktivieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Shopanpassungen_installieren.html | 2 +- .../Neuinstallation/TMP-Ordner_leeren.html | 2 +- .../Neuinstallation/Updatefaehigkeit.html | 2 +- .../Verwendung_eigener_Themes.html | 2 +- .../Neuinstallation/Vorbereitung.html | 2 +- .../installation/Neuinstallation/index.html | 4 +- docs/html/installation/Schnellstart.html | 2 +- .../installation/Update/Dateien_erneuern.html | 4 +- .../Update/Erweiterungen_anpassen.html | 2 +- .../Lizenzschluessel_aktualisieren.html | 2 +- .../Update/Modul_deaktivieren.html | 2 +- .../Modulinformationen_aktualisieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Update/Shopanpassungen_installieren.html | 2 +- .../Update/TMP-Ordner_leeren.html | 2 +- .../installation/Update/Updatedefinition.html | 2 +- docs/html/manual/Ergebnisanlyse.html | 2 +- .../manual/Erweiterungsmoeglichkeiten.html | 2 +- docs/html/manual/Fragen.html | 2 +- docs/html/manual/Inhalte.html | 2 +- docs/html/manual/Logging.html | 2 +- docs/html/manual/Optimierungen.html | 2 +- .../phonetischer_Index.html | 2 +- docs/html/manual/Statistik.html | 2 +- docs/html/manual/Synonym-Editor.html | 2 +- docs/html/manual/externeEinstellungen.html | 2 +- .../korrespondierendeAttributswerte.html | 2 +- docs/html/manual/optischeAnpassungen.html | 2 +- .../Indexleiste.html | 2 +- .../MultiAttributFilter.html | 2 +- .../Phonetic-Cronjob.html | 2 +- .../technische_Erlaeuterungen/Relevanz.html | 2 +- .../zusaetzliche_Formularfelder.html | 2 +- docs/html/support/Hilfe-und-Support.html | 2 +- .../html/tipuesearch/tipuesearch_content.json | 2 +- .../Admin/d3_cfg_extsearch_main.php | 61 ++++++++++++++++++- .../Model/Filters/d3AttributeFilter.php | 4 +- .../Model/Filters/d3CategoryFilter.php | 4 +- .../Model/Filters/d3FieldBitSetFilter.php | 4 +- .../Model/Filters/d3FieldIsFilter.php | 4 +- .../Model/Filters/d3FieldLikeFilter.php | 4 +- src/Application/Model/Filters/d3Filter.php | 4 +- .../Model/Filters/d3FilterInterface.php | 4 +- .../Model/Filters/d3FilterList.php | 4 +- .../Model/Filters/d3IndexFilter.php | 4 +- .../Model/Filters/d3ManufacturerFilter.php | 4 +- .../Model/Filters/d3PriceFilter.php | 4 +- .../Model/Filters/d3VendorFilter.php | 4 +- .../Model/d3_extsearch_statisticlog.php | 4 +- src/Application/Model/d3_extsearch_synset.php | 4 +- src/Application/Model/d3_extsearch_term.php | 4 +- .../Model/d3_oxutils_extsearch.php | 4 +- src/Application/Model/d3_phonetic_de.php | 4 +- src/Application/Model/d3_phonetic_de_voc.php | 4 +- src/Application/Model/d3_querygenerator.php | 4 +- src/Application/Model/d3_search.php | 4 +- src/Application/Model/d3_search_generator.php | 4 +- src/Application/Model/d3_semantic.php | 4 +- .../Model/d3extsearch_attribute2object.php | 4 +- .../views/admin/de/d3_extsearch_lang.php | 4 ++ .../views/admin/en/d3_extsearch_lang.php | 4 ++ .../tpl/d3_cfg_extsearchsyneditor_main.tpl | 10 +++ .../function.d3_extsearch_highlight.php | 4 +- src/Core/d3_extsearch_conf.php | 4 +- .../Model/d3_attribute_extsearch.php | 4 +- .../Model/d3_basemodel_extsearch.php | 4 +- .../Model/d3_category_extsearch.php | 4 +- .../Model/d3_manufacturer_extsearch.php | 4 +- .../Model/d3_oxarticle_phonetic.php | 4 +- .../Model/d3_oxarticlelist_extsearch.php | 4 +- .../Model/d3_oxrssfeed_extsearch.php | 4 +- .../Model/d3_oxsearch_extsearch.php | 4 +- .../Application/Model/d3_vendor_extsearch.php | 4 +- .../PsCache/Core/d3_CacheCore_extsearch.php | 4 +- src/metadata.php | 2 +- src/setup/d3_extsearch_semantic_synset.php | 4 +- src/setup/d3_extsearch_update.php | 16 ++--- src/tests/additional.inc.php | 4 +- src/tests/d3extsearch_config.php | 4 +- .../assignedFilters/allMultiFilterTest.php | 4 +- .../assignedFilters/allSingleFilterTest.php | 4 +- .../attributeMultiFilterInjectionTest.php | 4 +- .../attributeMultiFilterTest.php | 4 +- .../attributeSingleFilterInjectionTest.php | 4 +- .../attributeSingleFilterTest.php | 4 +- .../categoryMultiFilterInjectionTest.php | 4 +- .../categoryMultiFilterTest.php | 4 +- .../categoryMultiFilterVariantsTest.php | 4 +- .../categorySingleFilterInjectionTest.php | 4 +- .../categorySingleFilterTest.php | 4 +- .../categorySingleFilterVariantsTest.php | 4 +- ...searchFilterQueriesIntegrationTestCase.php | 4 +- .../assignedFilters/fieldIsFilterTest.php | 4 +- .../assignedFilters/fieldLikeFilterTest.php | 4 +- .../assignedFilters/indexFilterTest.php | 4 +- .../manufacturerMultiFilterInjectionTest.php | 4 +- .../manufacturerMultiFilterTest.php | 4 +- .../manufacturerSingleFilterInjectionTest.php | 4 +- .../manufacturerSingleFilterTest.php | 4 +- .../assignedFilters/nofilterTest.php | 4 +- .../priceArrayFilterInjectionTest.php | 4 +- .../assignedFilters/priceArrayFilterTest.php | 4 +- .../priceSliderFilterInjectionTest.php | 4 +- .../assignedFilters/priceSliderFilterTest.php | 4 +- .../vendorMultiFilterInjectionTest.php | 4 +- .../assignedFilters/vendorMultiFilterTest.php | 4 +- .../vendorSingleFilterInjectionTest.php | 4 +- .../vendorSingleFilterTest.php | 4 +- .../d3ExtsearchIntegrationTestCase.php | 4 +- .../filterlists/attributeFilterTest.php | 4 +- .../filterlists/categoryFilterTest.php | 4 +- ...xtsearchFilterlistsIntegrationTestCase.php | 4 +- .../filterlists/indexFilterTest.php | 4 +- .../filterlists/manufacturerFilterTest.php | 4 +- .../filterlists/priceFilterTest.php | 4 +- .../filterlists/vendorFilterTest.php | 4 +- .../queryExecute/alistQueryExecuteTest.php | 4 +- ...searchFilterQueriesIntegrationTestCase.php | 4 +- .../queryExecute/rssQueryExecuteTest.php | 4 +- .../queryExecute/searchQueryExecuteTest.php | 4 +- .../Filters/d3ManufacturerFilterTest.php | 4 +- .../Model/d3_querygeneratorTest.php | 4 +- .../unit/Application/Model/d3semanticTest.php | 4 +- .../Model/d3_oxarticlelist_extsearchTest.php | 4 +- .../Model/d3_oxsearch_extsearchTest.php | 4 +- src/tests/unit/d3ExtsearchUnitTestCase.php | 4 +- 149 files changed, 351 insertions(+), 248 deletions(-) diff --git a/composer.json b/composer.json index 191ed5e..7df549c 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "require": { "php": "^8.0", - "ext-sourceguardian": "*", + "ext-sourceguardian": "^14", "oxid-esales/oxideshop-ce": "6.8 - 6.14", "d3/modcfg": "^6.0", "d3/oxid-sql-logger": "^1.2.2", diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index 89e412d..f7ea1bd 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -8,13 +8,25 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.1...rel_7.x) +## [Unreleased](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.2...rel_7.x) + +## [7.1.6.2](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.1...7.1.6.2) - 2023-11-30 +### Added +- Suchfelder werden auf abweichende Kollationen geprüft +- Aktivstatus der Synonymgruppen kann im Backend geändert werden +### Fixed +- Extraktion der Suchbegriffe optimiert +- Kombination von Mehr-Wort-Synonymen korrigiert +- Kategoriefilter behalten Reihenfolge bei +- Abfragefehler für Kategorien bei Verwendung von Artikelvarianten +- Abfragefehler bei Filterung auf Hauptkategorien + ## [7.1.6.1](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.0...7.1.6.1) - 2023-10-20 ### Fixed - Abfragefehler bei mehrfacher Kategoriefilterselektion - Abfragefehler bei deaktivierten Datenbankviews -- verhintert das Ändern des "isAdmin" Status bei der Kompilierung für den Injection Container +- verhindert das Ändern des "isAdmin" Status bei der Kompilierung für den Injection Container - weise Artikeldaten nur bei existierendem Abfrageergebnis zu - Generierungsfehler bei Artikeln mit leerem Titel diff --git a/docs/daux/config.json b/docs/daux/config.json index 15653c6..ef9f187 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " erweiterte Suche", - "moduleversion": "7.1.6.1", + "moduleversion": "7.1.6.2", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "20.10.2023", + "moduledate": "30.11.2023", "editors": "", "tagline": "", "image": "", diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index d183eaf..6000d18 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -72,7 +72,7 @@
@@ -80,18 +80,32 @@

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

-

Unreleased

-

7.1.6.1 - 2023-10-20

+

Unreleased

+

7.1.6.2 - 2023-11-30

+

Added

+

Fixed

+

7.1.6.1 - 2023-10-20

+

Fixed

+

7.1.6.0 - 2023-06-21

-

Added

+

Added