From 825c7102aab57550f82cae2e2100e8bd0874ce2e Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Mon, 14 Apr 2025 11:32:17 +0200 Subject: [PATCH] add 7.1.7.0 (sourceGuardian for PHP 8) --- composer.json | 8 +- docs/daux/changelog/010_Changelog.md | 9 +- docs/daux/config.json | 4 +- .../010_Systemanforderungen.md | 2 +- docs/html/changelog/Changelog.html | 18 +++- docs/html/editions/Editionen.html | 2 +- docs/html/index.html | 4 +- .../Kompatibilitaet_mit_anderen_Modulen.html | 2 +- .../Anforderungen/Systemanforderungen.html | 4 +- .../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 +- phpstan.neon | 14 +++ .../Reports/d3_extsearch_report_hitless.php | 6 +- .../d3_extsearch_report_mostsearches.php | 6 +- .../Controller/d3_xlist_extsearch.php | 12 +-- .../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/tpl/d3_cfg_extsearch_main.tpl | 22 ++--- .../tpl/filterelements/priceselector.tpl | 98 ++++++++++--------- .../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_semanticstructure.php | 31 +----- src/setup/d3_extsearch_statisticlog.php | 33 +------ 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 +- 153 files changed, 364 insertions(+), 371 deletions(-) create mode 100644 phpstan.neon diff --git a/composer.json b/composer.json index 9e7c2be..29d0693 100644 --- a/composer.json +++ b/composer.json @@ -42,10 +42,16 @@ "d3/oxid-sql-logger": "^1.2.2", "splitbrain/php-cli": "^1.2.0" }, + "require-dev": { + "phpstan/phpstan": "^1.8" + }, "autoload": { "psr-4": { "D3\\Extsearch\\": "../../../source/modules/d3/extsearch" } }, - "bin": ["src/bin/d3_extsearch_cron"] + "bin": ["src/bin/d3_extsearch_cron"], + "scripts": { + "phpstan": "./vendor/bin/phpstan --configuration=./vendor/d3/extsearch/phpstan.neon" + } } diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index b75ce96..85d9d53 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -8,7 +8,14 @@ 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.3...rel_7.x) +## [Unreleased](https://git.d3data.de/D3Private/Extsearch/compare/7.1.7.0...rel_7.x) + +## [7.1.7.0](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.3...7.1.7.0) - 2025-04-14 +### Fixed +- Herstellerfilter bezieht seine Einträge auch aus kategorienamenbasierten Treffern +### Added +- Worttrenner könner geändert oder ergänzt werden +- alternative Sortierung für phonetische Treffer eingefügt ## [7.1.6.3](https://git.d3data.de/D3Private/Extsearch/compare/7.1.6.2...7.1.6.3) - 2023-12-13 ### Fixed diff --git a/docs/daux/config.json b/docs/daux/config.json index c4a8420..d8f8bac 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " erweiterte Suche", - "moduleversion": "7.1.6.3", + "moduleversion": "7.1.7.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "13.12.2023", + "moduledate": "14.04.2025", "editors": "", "tagline": "", "image": "", diff --git a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md index 32199ee..086426e 100644 --- a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md +++ b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md @@ -3,7 +3,7 @@ title: Systemanforderungen --- * PHP Version - * 7.3.x bis 8.1.x + * 7.3 bis 8.x * PHP Decoder * installierter ionCube Loader (PHP bis 7.4) *oder* * installierter SourceGuardian Loader (PHP ab 8.0) diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index e90f595..5ad181d 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -72,7 +72,7 @@

Changelog

- 07.03.2025 + 14.04.2025
@@ -80,14 +80,24 @@

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.3 - 2023-12-13

+

Unreleased

+

7.1.7.0 - 2025-04-14

Fixed

+

Added

+ +

7.1.6.3 - 2023-12-13

+

Fixed

+

7.1.6.2 - 2023-11-30

-

Added

+

Added