add 6.1.2.0 sourceGuardian PHP 8

This commit is contained in:
Daniel Seifert 2023-03-07 10:42:01 +01:00
parent f605395a5f
commit 1d624bbeca
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
126 changed files with 268 additions and 422 deletions

View File

@ -17,6 +17,7 @@
/** /**
* @return \Symfony\Component\DependencyInjection\ContainerBuilder * @return \Symfony\Component\DependencyInjection\ContainerBuilder
* @deprecated use d3GetOxidDIC instead
*/ */
function d3GetModCfgDIC() function d3GetModCfgDIC()
{ {

View File

@ -38,7 +38,8 @@
"require": { "require": {
"php": "^8.0", "php": "^8.0",
"ext-sourceguardian": "*", "ext-sourceguardian": "*",
"oxid-esales/oxideshop-ce": "6.8 - 6.13", "oxid-esales/oxideshop-ce": "6.8 - 6.14",
"d3/oxid-dic-handler": "^1.0",
"ext-openssl": "*", "ext-openssl": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-dom": "*", "ext-dom": "*",

View File

@ -2,9 +2,20 @@
title: Changelog title: Changelog
--- ---
## 6.1.2.0 (2023-03-03)
### Added
- installierbar in OXID 6.5.2 (CE 6.14)
- DI-Container wird aus separatem Paket bezogen und ist nicht mehr Teil des Connectors
## 6.1.1.0 (2022-12-20)
### Added
- installierbar in OXID 6.5.1 (CE 6.13)
- Logstatus kann auch mit Ganzzahlen (z.B. aus Konstanten) definiert werden
- fängt alle Exceptions, die während des Loggings auftreten
## 6.1.0.0 (2022-08-29) ## 6.1.0.0 (2022-08-29)
### Added ### Added
- installiertbar in OXID 6.5 (CE 6.12) - installierbar in OXID 6.5 (CE 6.12)
- Caches für Thememapping und Modulkonfiguration eingefügt - Caches für Thememapping und Modulkonfiguration eingefügt
### Changed ### Changed

View File

@ -1,9 +1,9 @@
{ {
"title": "<i class='fab fa-d3 d3fa-color-blue'></i> Modul-Connector", "title": "<i class='fab fa-d3 d3fa-color-blue'></i> Modul-Connector",
"moduleversion": "6.1.1.0", "moduleversion": "6.1.2.0",
"titledesc": "für den Oxid eShop", "titledesc": "für den Oxid eShop",
"author": "D³ Data Development", "author": "D³ Data Development",
"moduledate": "29.08.2022", "moduledate": "03.03.2023",
"editors": "", "editors": "",
"tagline": "", "tagline": "",
"image": "", "image": "",

View File

@ -72,14 +72,27 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../changelog/Changelog.html">Changelog</a></h1> <h1><a href="../changelog/Changelog.html">Changelog</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">
<h2 id="page_6-1-0-0-2022-08-29">6.1.0.0 (2022-08-29)</h2> <h2 id="page_6-1-2-0-2023-03-03">6.1.2.0 (2023-03-03)</h2>
<h3 id="page_Added">Added</h3> <h3 id="page_Added">Added</h3>
<ul> <ul>
<li>installiertbar in OXID 6.5 (CE 6.12)</li> <li>installierbar in OXID 6.5.2 (CE 6.14)</li>
<li>DI-Container wird aus separatem Paket bezogen und ist nicht mehr Teil des Connectors</li>
</ul>
<h2 id="page_6-1-1-0-2022-12-20">6.1.1.0 (2022-12-20)</h2>
<h3 id="page_Added-2">Added</h3>
<ul>
<li>installierbar in OXID 6.5.1 (CE 6.13)</li>
<li>Logstatus kann auch mit Ganzzahlen (z.B. aus Konstanten) definiert werden</li>
<li>fängt alle Exceptions, die während des Loggings auftreten</li>
</ul>
<h2 id="page_6-1-0-0-2022-08-29">6.1.0.0 (2022-08-29)</h2>
<h3 id="page_Added-2">Added</h3>
<ul>
<li>installierbar in OXID 6.5 (CE 6.12)</li>
<li>Caches für Thememapping und Modulkonfiguration eingefügt</li> <li>Caches für Thememapping und Modulkonfiguration eingefügt</li>
</ul> </ul>
<h3 id="page_Changed">Changed</h3> <h3 id="page_Changed">Changed</h3>

View File

@ -48,8 +48,8 @@
<div class="details"> <div class="details">
<div>Autor: D³ Data Development</div> <div>Stand: 29.08.2022</div> <div>Autor: D³ Data Development</div> <div>Stand: 03.03.2023</div>
<div>Version: 6.1.1.0</div> <div>Version: 6.1.2.0</div>
</div> </div>
</div> </div>

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Anforderungen/Systemanforderungen.html">Anforderungen</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Anforderungen/Beiliegende_Bibliotheken.html">beiliegende Bibliotheken</a></h1> <h1><a href="../../installation/Anforderungen/Systemanforderungen.html">Anforderungen</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Anforderungen/Beiliegende_Bibliotheken.html">beiliegende Bibliotheken</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Anforderungen/Systemanforderungen.html">Anforderungen</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Anforderungen/Systemanforderungen.html">Systemanforderungen</a></h1> <h1><a href="../../installation/Anforderungen/Systemanforderungen.html">Anforderungen</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Anforderungen/Systemanforderungen.html">Systemanforderungen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Dateien_loeschen.html">Dateien löschen</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Dateien_loeschen.html">Dateien löschen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Datenbank_bereinigen.html">Datenbank bereinigen</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Datenbank_bereinigen.html">Datenbank bereinigen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modul_aus_der_Installation_entfernen.html">Modul aus der Installation entfernen</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modul_aus_der_Installation_entfernen.html">Modul aus der Installation entfernen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modul_deaktivieren.html">Modul deaktivieren</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modul_deaktivieren.html">Modul deaktivieren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Modulerweiterungen deaktivieren und entfernen</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Modulerweiterungen deaktivieren und entfernen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1> <h1><a href="../../installation/Deinstallation/Modulerweiterungen_deaktivieren_und_entfernen.html">Deinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Deinstallation/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../installation/Installation.html">Installation / Update / Deinstallation</a></h1> <h1><a href="../installation/Installation.html">Installation / Update / Deinstallation</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../installation/Installationspruefung.html">Installationsprüfung</a></h1> <h1><a href="../installation/Installationspruefung.html">Installationsprüfung</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,13 +72,13 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Modul_hinzufuegen.html">Modul zur Installation hinzufügen</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Modul_hinzufuegen.html">Modul zur Installation hinzufügen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">
<h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3> <h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3>
<p>Führen Sie in der Konsole im Hauptverzeichnis Ihres Shops (oberhalb des <code>source</code>- und <code>vendor</code>-Verzeichnisses) diesen Befehl aus, um das Modul <strong><i class='fab fa-d3 d3fa-color-blue'></i> Modul-Connector</strong> zur Installation hinzuzufügen:</p> <p>Führen Sie in der Konsole im Hauptverzeichnis Ihres Shops (oberhalb des <code>source</code>- und <code>vendor</code>-Verzeichnisses) diesen Befehl aus, um das Modul <strong><i class='fab fa-d3 d3fa-color-blue'></i> Modul-Connector</strong> zur Installation hinzuzufügen:</p>
<pre><code class="language-bash">php composer require d3/modcfg:^6.1.1.0 --update-no-dev <pre><code class="language-bash">php composer require d3/modcfg:^6.1.2.0 --update-no-dev
&gt; [!] Achten Sie darauf, dass Composer für die Installation die selbe PHP-Version verwendet, in der auch Ihr Shop ausgeführt wird. Sie erhalten sonst möglicherweise unpassende Modulpakete. &gt; [!] Achten Sie darauf, dass Composer für die Installation die selbe PHP-Version verwendet, in der auch Ihr Shop ausgeführt wird. Sie erhalten sonst möglicherweise unpassende Modulpakete.

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Modul_im_Shop_aktivieren.html">Modul im Shop aktivieren</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Modul_im_Shop_aktivieren.html">Modul im Shop aktivieren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Providerspezifische_Installation.html">Providerspezifische Installation</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Providerspezifische_Installation.html">Providerspezifische Installation</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Shopanpassungen_installieren.html">Shopanpassungen installieren</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Shopanpassungen_installieren.html">Shopanpassungen installieren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Updatefaehigkeit.html">Updatefähigkeit</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Neuinstallation/Updatefaehigkeit.html">Updatefähigkeit</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,13 +72,13 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a></h1> <h1><a href="../../installation/Neuinstallation/index.html">Neuinstallation</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">
<h2 id="page_Schnellstart-per-Composer">Schnellstart per Composer</h2> <h2 id="page_Schnellstart-per-Composer">Schnellstart per Composer</h2>
<h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3> <h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3>
<pre><code class="language-bash">php composer require d3/modcfg:^6.1.1.0 --update-no-dev <pre><code class="language-bash">php composer require d3/modcfg:^6.1.2.0 --update-no-dev
./vendor/bin/oe-console oe:module:activate d3modcfg_lib ./vendor/bin/oe-console oe:module:activate d3modcfg_lib
./vendor/bin/d3modules_install ./vendor/bin/d3modules_install
./vendor/bin/d3cleartmp ./vendor/bin/d3cleartmp

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../installation/Schnellstart.html">Schnellstart</a></h1> <h1><a href="../installation/Schnellstart.html">Schnellstart</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../installation/Shopupgrade.html">Shopupgrade</a></h1> <h1><a href="../installation/Shopupgrade.html">Shopupgrade</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,14 +72,14 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Dateien_erneuern.html">Dateien erneuern</a></h1> <h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Dateien_erneuern.html">Dateien erneuern</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">
<h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3> <h3 id="page_auf-der-Kommandozeile"><strong>auf der Kommandozeile</strong></h3>
<p>Starten Sie die Konsole Ihres Webservers und wechseln in das Hauptverzeichnis Ihres <p>Starten Sie die Konsole Ihres Webservers und wechseln in das Hauptverzeichnis Ihres
Shops (oberhalb des <code>source</code>- und <code>vendor</code>-Verzeichnisses). Führen Sie dort diesen Befehl aus:</p> Shops (oberhalb des <code>source</code>- und <code>vendor</code>-Verzeichnisses). Führen Sie dort diesen Befehl aus:</p>
<pre><code class="language-bash">php composer require d3/modcfg:^6.1.1.0 --update-no-dev <pre><code class="language-bash">php composer require d3/modcfg:^6.1.2.0 --update-no-dev
</code></pre> </code></pre>
<p>Im weiteren Ablauf werden Sie gefragt, ob die Moduldateien überschrieben werden sollen. Bestätigen Sie dies für den Eintrag <code>d3/modcfg</code>.</p> <p>Im weiteren Ablauf werden Sie gefragt, ob die Moduldateien überschrieben werden sollen. Bestätigen Sie dies für den Eintrag <code>d3/modcfg</code>.</p>
<blockquote class="alert alert-warning"> <blockquote class="alert alert-warning">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Providerspezifische_Installation.html">Providerspezifische Installation</a></h1> <h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Providerspezifische_Installation.html">Providerspezifische Installation</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Shopanpassungen_installieren.html">Shopanpassungen installieren</a></h1> <h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Shopanpassungen_installieren.html">Shopanpassungen installieren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1> <h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/TMP-Ordner_leeren.html">TMP-Ordner leeren</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Updatedefinition.html">Wann kann ein Update ausgeführt werden?</a></h1> <h1><a href="../../installation/Update/index.html">Update</a> <svg class="Page__header--separator" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.175 477.175"><path d="M360.73 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z"/></svg> <a href="../../installation/Update/Updatedefinition.html">Wann kann ein Update ausgeführt werden?</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../../installation/Update/index.html">Update</a></h1> <h1><a href="../../installation/Update/index.html">Update</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../manual/Einsatz_in_anderen_Modulen.html">Einsatz in anderen Modulen</a></h1> <h1><a href="../manual/Einsatz_in_anderen_Modulen.html">Einsatz in anderen Modulen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../manual/Was_ist_im_Connector_enthalten.html">Was ist im Connector enthalten</a></h1> <h1><a href="../manual/Was_ist_im_Connector_enthalten.html">Was ist im Connector enthalten</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../manual/optischeAnpassungen.html">optische Anpassungen</a></h1> <h1><a href="../manual/optischeAnpassungen.html">optische Anpassungen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../manual/zusaetzliche_Config_Einstellungen.html">zusätzliche Config-Einstellungen</a></h1> <h1><a href="../manual/zusaetzliche_Config_Einstellungen.html">zusätzliche Config-Einstellungen</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

View File

@ -72,7 +72,7 @@
<div class="Page__header"> <div class="Page__header">
<h1><a href="../support/Hilfe-und-Support.html">Hilfe und Support</a></h1> <h1><a href="../support/Hilfe-und-Support.html">Hilfe und Support</a></h1>
<span class="ModifiedDate"> <span class="ModifiedDate">
02.01.2023 </span> 03.03.2023 </span>
</div> </div>
<div class="s-content"> <div class="s-content">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -15,51 +15,21 @@
namespace D3\ModCfg\Application\Model\DependencyInjectionContainer; namespace D3\ModCfg\Application\Model\DependencyInjectionContainer;
use D3\ModCfg\Application\Model\Modulemetadata\d3moduleconfiguration; use D3\DIContainerHandler\d3DicHandler as externalDICHandler;
use d3CacheContainer;
use Exception;
use OxidEsales\Eshop\Core\Module\ModuleList;
use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\Request;
use OxidEsales\Facts\Config\ConfigFile;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
/**
* @deprecated use D3\DIContainerHandler\d3DicHandler
*/
class d3DicHandler implements d3DicHandlerInterface class d3DicHandler implements d3DicHandlerInterface
{ {
/**
* instance
* @var array
*/
protected static $_instance;
public static $circularReferenceMethodNames = array(
'getViewConfig'
);
/** /**
* get instance * get instance
* @return ContainerBuilder * @return ContainerBuilder
*/ */
public static function getInstance() public static function getInstance()
{ {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); return externalDICHandler::getInstance();
$caller = $trace[1];
$functionName = $caller['function'];
if (in_array(strtolower($functionName), array_map('strtolower', self::$circularReferenceMethodNames)))
{
throw oxNew(Exception::class, 'method '.$functionName." can't use DIC due the danger of circular reference");
}
if (null == self::$_instance) {
$oDicHandler = oxNew(d3DicHandler::class);
self::$_instance = $oDicHandler->buildContainer();
}
return self::$_instance;
} }
/** /**
@ -68,172 +38,12 @@ class d3DicHandler implements d3DicHandlerInterface
*/ */
public static function getUncompiledInstance() public static function getUncompiledInstance()
{ {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); return externalDICHandler::getUncompiledInstance();
$caller = $trace[1];
$functionName = $caller['function'];
if (in_array(strtolower($functionName), array_map('strtolower', self::$circularReferenceMethodNames)))
{
throw oxNew(Exception::class, 'method '.$functionName." can't use DIC due the danger of circular reference");
}
$oDicHandler = oxNew(d3DicHandler::class);
self::$_instance = $oDicHandler->buildContainer(false);
return self::$_instance;
} }
public static function removeInstance() public static function removeInstance()
{ {
self::$_instance = null; externalDICHandler::removeInstance();
}
/**
* @return mixed
*/
public function d3GetConfig()
{
return Registry::getConfig();
}
public function d3GetCacheFilePath()
{
return $this->d3GetConfig()->getConfigParam('sCompileDir').'/d3DicContainer_'.Registry::getConfig()->getShopId().'.php';
}
/**
* @return d3CacheContainer|object
*/
public function d3GetCacheContainer()
{
require_once $this->d3GetCacheFilePath();
return oxNew(d3CacheContainer::class);
}
/**
* @param $container
* @return YamlFileLoader
*/
public function d3GetFileLoader($container)
{
/** @var YamlFileLoader $fileLoader */
$fileLoader = oxNew(YamlFileLoader::class,
$container,
oxNew(FileLocator::class, $this->d3GetConfig()->getModulesDir())
);
return $fileLoader;
}
/**
* @param $container
*/
public function loadFiles($container)
{
$loader = $this->d3GetFileLoader($container);
foreach ($this->getShopDefinitionFiles() as $file) {
$fullPath = $this->d3GetConfig()->getModulesDir().$file;
if (is_file($fullPath)) {
$loader->load($file);
}
}
}
/**
* @param bool $compileAndDump
* @return ContainerBuilder
*/
public function buildContainer(bool $compileAndDump = true)
{
if ((bool) Registry::get( ConfigFile::class)->getVar( 'iDebug')) startProfile(__METHOD__);
$config = $this->d3GetConfig();
if ($config->isProductiveMode()
&& false == $config->getConfigParam('iDebug')
&& (false == defined('OXID_PHP_UNIT') || true == defined('D3_MODCFG_TEST'))
&& file_exists($this->d3GetCacheFilePath())
) {
$container = $this->d3GetCacheContainer();
} else {
$container = $this->getContainerBuilder();
$this->loadFiles($container);
if ($compileAndDump) {
$container->compile();
if (false == defined('OXID_PHP_UNIT')) {
$dumper = new PhpDumper($container);
file_put_contents($this->d3GetCacheFilePath(), $dumper->dump(array('class' => 'd3CacheContainer')));
}
}
}
if ((bool) Registry::get( ConfigFile::class)->getVar( 'iDebug')) stopProfile(__METHOD__);
return $container;
}
public function getContainerBuilder()
{
return oxNew(ContainerBuilder::class);
}
/**
* @return array
*/
public function getShopDefinitionFiles()
{
return $this->getDefinitionFiles('d3DICDefinitionFiles');
}
/**
* @param $sMetaDataIdent
* @return array
*/
public function getDefinitionFiles($sMetaDataIdent)
{
$aDICDefintionFileList = [];
/** @var ModuleList $oModuleList */
$oModuleList = oxNew(ModuleList::class);
$aActiveModuleIdList = array_keys($oModuleList->getActiveModuleInfo());
if (Registry::get(Request::class)->getRequestEscapedParameter('cl') === 'module_main'
&& ($sCurrentModuleId = Registry::get(Request::class)->getRequestEscapedParameter('oxid'))
&& false === in_array($sCurrentModuleId, $aActiveModuleIdList)
) {
$aActiveModuleIdList[] = $sCurrentModuleId;
}
foreach ($aActiveModuleIdList as $sModuleId) {
$oModuleConfiguration = oxNew(d3moduleconfiguration::class);
$aDICDefintionFiles = $oModuleConfiguration->getInfo($sMetaDataIdent, $sModuleId);
if (isset($aDICDefintionFiles) && is_array($aDICDefintionFiles)) {
$aDICDefintionFileList = array_merge($aDICDefintionFileList, $aDICDefintionFiles);
}
}
$aBaseServiceIds = array(
'd3/modcfg'
);
$aDefFileList = array();
foreach ($aDICDefintionFileList as $sKey => $sFileName) {
foreach ($aBaseServiceIds as $sBaseKey => $sBaseClass) {
if (strstr(strtolower($sFileName), strtolower($sBaseClass))) {
$aDefFileList[$sBaseKey] = $sFileName;
unset($aDICDefintionFileList[$sKey]);
}
}
}
ksort($aDefFileList, SORT_NUMERIC);
$aDefFileList = array_merge($aDefFileList, $aDICDefintionFileList);
return $aDefFileList;
} }
/** /**

View File

@ -4,6 +4,8 @@ namespace D3\ModCfg\Application\Model\DependencyInjectionContainer;
/** /**
* Interface d3DicHandlerInterface * Interface d3DicHandlerInterface
*
* @deprecated use D3\DIContainerHandler\d3DicHandlerInterface
*/ */
interface d3DicHandlerInterface interface d3DicHandlerInterface
{ {

View File

@ -15,6 +15,9 @@
namespace D3\ModCfg\Application\Model\DependencyInjectionContainer; namespace D3\ModCfg\Application\Model\DependencyInjectionContainer;
use D3\DIContainerHandler\d3DicUtilities as externalDicUtilities;
/** @deprecated use D3\DIContainerHandler\d3DicUtilities */
class d3DicUtilities class d3DicUtilities
{ {
/** /**
@ -24,10 +27,7 @@ class d3DicUtilities
*/ */
public static function getServiceId($classNameSpace, $additional = false) public static function getServiceId($classNameSpace, $additional = false)
{ {
return strtolower( return externalDicUtilities::getServiceId( $classNameSpace, $additional);
($additional ? $additional.'.' : '').
$classNameSpace
);
} }
/** /**
@ -37,10 +37,6 @@ class d3DicUtilities
*/ */
public static function getArgumentId($classNamespace, $argumentName) public static function getArgumentId($classNamespace, $argumentName)
{ {
return strtolower( return externalDicUtilities::getArgumentId($classNamespace, $argumentName);
$classNamespace.
'.args.' .
$argumentName
);
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,2 @@
<?php ?><?php /** This Software is the property of D³ Data Development and is protected by copyright law - it is NOT Freeware. Any unauthorized use of this software without a valid license key is a violation of the license agreement and will be prosecuted by civil and criminal law. Inhaber: Thomas Dartsch Alle Rechte vorbehalten @package Modul-Connector @version 6.1.1.0 SourceGuardian (02.01.2023) @author Daniel Seifert support@shopmodule.com @copyright (C) 2023, D3 Data Development @see https://www.d3data.de */ ?><?php <?php ?><?php /** This Software is the property of D³ Data Development and is protected by copyright law - it is NOT Freeware. Any unauthorized use of this software without a valid license key is a violation of the license agreement and will be prosecuted by civil and criminal law. Inhaber: Thomas Dartsch Alle Rechte vorbehalten @package Modul-Connector @version 6.1.2.0 SourceGuardian (03.03.2023) @author Daniel Seifert support@shopmodule.com @copyright (C) 2023, D3 Data Development @see https://www.d3data.de */ ?><?php
if(!function_exists('sg_load')){$__v=phpversion();$__x=explode('.',$__v);$__v2=$__x[0].'.'.(int)$__x[1];$__u=strtolower(substr(php_uname(),0,3));$__ts=(@constant('PHP_ZTS') || @constant('ZEND_THREAD_SAFE')?'ts':'');$__f=$__f0='ixed.'.$__v2.$__ts.'.'.$__u;$__ff=$__ff0='ixed.'.$__v2.'.'.(int)$__x[2].$__ts.'.'.$__u;$__ed=@ini_get('extension_dir');$__e=$__e0=@realpath($__ed);$__dl=function_exists('dl') && function_exists('file_exists') && @ini_get('enable_dl') && !@ini_get('safe_mode');if($__dl && $__e && version_compare($__v,'5.2.5','<') && function_exists('getcwd') && function_exists('dirname')){$__d=$__d0=getcwd();if(@$__d[1]==':') {$__d=str_replace('\\','/',substr($__d,2));$__e=str_replace('\\','/',substr($__e,2));}$__e.=($__h=str_repeat('/..',substr_count($__e,'/')));$__f='/ixed/'.$__f0;$__ff='/ixed/'.$__ff0;while(!file_exists($__e.$__d.$__ff) && !file_exists($__e.$__d.$__f) && strlen($__d)>1){$__d=dirname($__d);}if(file_exists($__e.$__d.$__ff)) dl($__h.$__d.$__ff); else if(file_exists($__e.$__d.$__f)) dl($__h.$__d.$__f);}if(!function_exists('sg_load') && $__dl && $__e0){if(file_exists($__e0.'/'.$__ff0)) dl($__ff0); else if(file_exists($__e0.'/'.$__f0)) dl($__f0);}if(!function_exists('sg_load')){$__ixedurl='https://www.sourceguardian.com/loaders/download.php?php_v='.urlencode($__v).'&php_ts='.($__ts?'1':'0').'&php_is='.@constant('PHP_INT_SIZE').'&os_s='.urlencode(php_uname('s')).'&os_r='.urlencode(php_uname('r')).'&os_m='.urlencode(php_uname('m'));$__sapi=php_sapi_name();if(!$__e0) $__e0=$__ed;if(function_exists('php_ini_loaded_file')) $__ini=php_ini_loaded_file(); else $__ini='php.ini';if((substr($__sapi,0,3)=='cgi')||($__sapi=='cli')||($__sapi=='embed')){$__msg="\nPHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.\n\n1) Download the required loader '".$__f0."' from the SourceGuardian site: ".$__ixedurl."\n2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="\n3) Edit ".$__ini." and add 'extension=".$__f0."' directive";}}$__msg.="\n\n";}else{$__msg="<html><body>PHP script '".__FILE__."' is protected by <a href=\"https://www.sourceguardian.com/\">SourceGuardian</a> and requires a SourceGuardian loader '".$__f0."' to be installed.<br><br>1) <a href=\"".$__ixedurl."\" target=\"_blank\">Click here</a> to download the required '".$__f0."' loader from the SourceGuardian site<br>2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="<br>3) Edit ".$__ini." and add 'extension=".$__f0."' directive<br>4) Restart the web server";}}$__msg.="</body></html>";}die($__msg);exit();}}return sg_load('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'); if(!function_exists('sg_load')){$__v=phpversion();$__x=explode('.',$__v);$__v2=$__x[0].'.'.(int)$__x[1];$__u=strtolower(substr(php_uname(),0,3));$__ts=(@constant('PHP_ZTS') || @constant('ZEND_THREAD_SAFE')?'ts':'');$__f=$__f0='ixed.'.$__v2.$__ts.'.'.$__u;$__ff=$__ff0='ixed.'.$__v2.'.'.(int)$__x[2].$__ts.'.'.$__u;$__ed=@ini_get('extension_dir');$__e=$__e0=@realpath($__ed);$__dl=function_exists('dl') && function_exists('file_exists') && @ini_get('enable_dl') && !@ini_get('safe_mode');if($__dl && $__e && version_compare($__v,'5.2.5','<') && function_exists('getcwd') && function_exists('dirname')){$__d=$__d0=getcwd();if(@$__d[1]==':') {$__d=str_replace('\\','/',substr($__d,2));$__e=str_replace('\\','/',substr($__e,2));}$__e.=($__h=str_repeat('/..',substr_count($__e,'/')));$__f='/ixed/'.$__f0;$__ff='/ixed/'.$__ff0;while(!file_exists($__e.$__d.$__ff) && !file_exists($__e.$__d.$__f) && strlen($__d)>1){$__d=dirname($__d);}if(file_exists($__e.$__d.$__ff)) dl($__h.$__d.$__ff); else if(file_exists($__e.$__d.$__f)) dl($__h.$__d.$__f);}if(!function_exists('sg_load') && $__dl && $__e0){if(file_exists($__e0.'/'.$__ff0)) dl($__ff0); else if(file_exists($__e0.'/'.$__f0)) dl($__f0);}if(!function_exists('sg_load')){$__ixedurl='https://www.sourceguardian.com/loaders/download.php?php_v='.urlencode($__v).'&php_ts='.($__ts?'1':'0').'&php_is='.@constant('PHP_INT_SIZE').'&os_s='.urlencode(php_uname('s')).'&os_r='.urlencode(php_uname('r')).'&os_m='.urlencode(php_uname('m'));$__sapi=php_sapi_name();if(!$__e0) $__e0=$__ed;if(function_exists('php_ini_loaded_file')) $__ini=php_ini_loaded_file(); else $__ini='php.ini';if((substr($__sapi,0,3)=='cgi')||($__sapi=='cli')||($__sapi=='embed')){$__msg="\nPHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.\n\n1) Download the required loader '".$__f0."' from the SourceGuardian site: ".$__ixedurl."\n2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="\n3) Edit ".$__ini." and add 'extension=".$__f0."' directive";}}$__msg.="\n\n";}else{$__msg="<html><body>PHP script '".__FILE__."' is protected by <a href=\"https://www.sourceguardian.com/\">SourceGuardian</a> and requires a SourceGuardian loader '".$__f0."' to be installed.<br><br>1) <a href=\"".$__ixedurl."\" target=\"_blank\">Click here</a> to download the required '".$__f0."' loader from the SourceGuardian site<br>2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="<br>3) Edit ".$__ini." and add 'extension=".$__f0."' directive<br>4) Restart the web server";}}$__msg.="</body></html>";}die($__msg);exit();}}return sg_load('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');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More