From 8ab94a3c4ae8e4059e2213d56b1ea13387aba1d7 Mon Sep 17 00:00:00 2001 From: ilyakubanov Date: Thu, 11 Jul 2024 16:28:29 +0200 Subject: [PATCH 1/4] composer --- composer.json | 12 +- composer.lock | 504 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 417 insertions(+), 99 deletions(-) diff --git a/composer.json b/composer.json index 94f62671e..7900e5136 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "spryker-eco/loggly": "^0.1.1", "spryker-eco/new-relic": "^2.0.1", "spryker-feature/acl": "^202404.0", - "spryker-feature/agent-assist": "^202404.0", + "spryker-feature/agent-assist": "dev-master as 202407.0", "spryker-feature/alternative-products": "^202404.0", "spryker-feature/approval-process": "^202404.0", "spryker-feature/availability-notification": "^202404.0", @@ -106,7 +106,7 @@ "spryker-feature/shipment": "^202404.0", "spryker-feature/shopping-lists": "dev-master as 202407.0", "spryker-feature/spryker-core": "dev-master as 202407.0", - "spryker-feature/spryker-core-back-office": "^202404.0", + "spryker-feature/spryker-core-back-office": "dev-master as 202407.0", "spryker-feature/state-machine": "^202404.0", "spryker-feature/tax": "^202404.0", "spryker-shop/asset-widget": "^1.0.0", @@ -116,14 +116,14 @@ "spryker-shop/cms-content-widget-product-connector": "^1.3.0", "spryker-shop/cms-content-widget-product-set-connector": "^1.4.0", "spryker-shop/date-time-configurator-page-example": "^0.5.1", - "spryker/agent-auth-rest-api": "^1.0.0", + "spryker/agent-auth-rest-api": "^1.1.0", "spryker/agent-dashboard-merchant-portal-gui": "^1.0.0", "spryker/agent-security-blocker-merchant-portal-gui": "^1.0.0", - "spryker/agent-security-merchant-portal-gui": "^1.0.0", + "spryker/agent-security-merchant-portal-gui": "^1.1.0", "spryker/alternative-products-rest-api": "^1.1.2", "spryker/api-key-authorization-connector": "^1.1.0", "spryker/app-catalog-gui": "^1.4.1", - "spryker/auth-rest-api": "^2.14.2", + "spryker/auth-rest-api": "^2.15.0", "spryker/availability-cart-connector": "^7.3.0", "spryker/availability-merchant-portal-gui": "^1.0.0", "spryker/availability-notifications-rest-api": "^1.2.0", @@ -216,7 +216,7 @@ "spryker/oauth-agent-connector": "^1.2.0", "spryker/oauth-api": "^1.3.0", "spryker/oauth-auth0": "^1.1.0", - "spryker/oauth-backend-api": "^1.5.0", + "spryker/oauth-backend-api": "^1.6.0", "spryker/oauth-client": "^1.4.0", "spryker/oauth-company-user": "^2.2.1", "spryker/oauth-customer-connector": "^1.8.0", diff --git a/composer.lock b/composer.lock index 280000601..a4ca9f869 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "0d3b3748e0363538e00b50bbb1ce741b", + "content-hash": "bf3ea2c5771f5fe78d7e60931c658598", "packages": [ { "name": "async-aws/core", @@ -4919,7 +4919,7 @@ }, { "name": "spryker-feature/agent-assist", - "version": "202404.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/spryker-feature/agent-assist.git", @@ -4940,6 +4940,7 @@ "spryker/agent-gui": "^1.2.0", "spryker/security-blocker-storefront-agent": "^1.0.0" }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -8574,12 +8575,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-feature/spryker-core.git", - "reference": "16872bdb4b40827324a5521135c63f2148fc4b9d" + "reference": "2cafd1b935cdc33f92534c007eda1e9bdb78ac82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-feature/spryker-core/zipball/16872bdb4b40827324a5521135c63f2148fc4b9d", - "reference": "16872bdb4b40827324a5521135c63f2148fc4b9d", + "url": "https://api.github.com/repos/spryker-feature/spryker-core/zipball/2cafd1b935cdc33f92534c007eda1e9bdb78ac82", + "reference": "2cafd1b935cdc33f92534c007eda1e9bdb78ac82", "shasum": "" }, "require": { @@ -8638,6 +8639,7 @@ "spryker/publisher": "^1.2.0", "spryker/rabbit-mq": "^2.18.0", "spryker/router": "^1.19.0", + "spryker/rule-engine": "^1.0.0", "spryker/scheduler": "^1.4.0", "spryker/security": "^1.8.0", "spryker/security-blocker": "^1.2.0", @@ -8652,7 +8654,10 @@ "spryker/storage-database": "^1.2.0", "spryker/storage-redis": "^1.4.0", "spryker/store": "^1.25.0", - "spryker/store-context-gui": "^1.0.0", + "spryker/store-context": "^1.0.0", + "spryker/store-context-data-import": "^0.1.0", + "spryker/store-context-gui": "^2.0.0", + "spryker/store-context-storage": "^1.0.0", "spryker/store-data-import": "^0.1.0", "spryker/store-gui": "^1.3.0", "spryker/store-storage": "^1.0.0", @@ -8670,7 +8675,7 @@ "type": "metapackage", "extra": { "branch-alias": { - "dev-master": "202404.x-dev" + "dev-master": "202407.x-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -8679,13 +8684,13 @@ ], "description": "Spryker Core [feature]", "support": { - "source": "https://github.com/spryker-feature/spryker-core/tree/202404.0" + "source": "https://github.com/spryker-feature/spryker-core/tree/master" }, - "time": "2024-04-23T08:48:35+00:00" + "time": "2024-07-11T11:06:05+00:00" }, { "name": "spryker-feature/spryker-core-back-office", - "version": "202404.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/spryker-feature/spryker-core-back-office.git", @@ -8714,6 +8719,7 @@ "spryker/user-password-reset-mail": "^1.1.0", "spryker/zed-navigation": "^1.13.0" }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -8972,16 +8978,16 @@ }, { "name": "spryker-shop/agent-page", - "version": "1.14.1", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/agent-page.git", - "reference": "6508f650016a09bf3ba42022b7b409afb8a4c261" + "reference": "61493fa7792e73e1b89f6f2dfefca322164f611f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/agent-page/zipball/6508f650016a09bf3ba42022b7b409afb8a4c261", - "reference": "6508f650016a09bf3ba42022b7b409afb8a4c261", + "url": "https://api.github.com/repos/spryker-shop/agent-page/zipball/61493fa7792e73e1b89f6f2dfefca322164f611f", + "reference": "61493fa7792e73e1b89f6f2dfefca322164f611f", "shasum": "" }, "require": { @@ -8995,11 +9001,13 @@ "spryker/application": "^3.9.0", "spryker/customer": "^7.10.0", "spryker/kernel": "^3.52.0", + "spryker/log": "^3.17.0", "spryker/messenger": "^3.1.0", "spryker/quote": "^2.0.0", "spryker/router": "^1.5.0", "spryker/security-extension": "^1.0.0", - "spryker/symfony": "^3.1.0" + "spryker/symfony": "^3.1.0", + "spryker/transfer": "^3.27.0" }, "require-dev": { "spryker/code-sniffer": "*", @@ -9034,9 +9042,9 @@ ], "description": "AgentPage module", "support": { - "source": "https://github.com/spryker-shop/agent-page/tree/1.14.1" + "source": "https://github.com/spryker-shop/agent-page/tree/1.15.0" }, - "time": "2024-03-13T15:14:48+00:00" + "time": "2024-07-09T11:33:31+00:00" }, { "name": "spryker-shop/agent-page-extension", @@ -11342,16 +11350,16 @@ }, { "name": "spryker-shop/customer-page", - "version": "2.52.0", + "version": "2.53.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/customer-page.git", - "reference": "9569dcef918bc9fac775584d5b10ff5b0edf9647" + "reference": "70243113ab4922c48fbf93643a0f73781a19df63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/customer-page/zipball/9569dcef918bc9fac775584d5b10ff5b0edf9647", - "reference": "9569dcef918bc9fac775584d5b10ff5b0edf9647", + "url": "https://api.github.com/repos/spryker-shop/customer-page/zipball/70243113ab4922c48fbf93643a0f73781a19df63", + "reference": "70243113ab4922c48fbf93643a0f73781a19df63", "shasum": "" }, "require": { @@ -11364,6 +11372,7 @@ "spryker/application-extension": "^1.0.0", "spryker/customer": "^7.30.0", "spryker/kernel": "^3.52.0", + "spryker/log": "^3.17.0", "spryker/product-bundle": "^4.1.0 || ^6.0.0 || ^7.0.0", "spryker/quote": "^1.0.0 || ^2.1.0", "spryker/router": "^1.6.0", @@ -11374,7 +11383,7 @@ "spryker/step-engine": "^3.3.0", "spryker/store": "^1.19.0", "spryker/symfony": "^3.1.0", - "spryker/transfer": "^3.25.0", + "spryker/transfer": "^3.27.0", "spryker/twig": "^3.18.0", "spryker/twig-extension": "^1.0.0", "spryker/util-validate": "^1.0.0" @@ -11433,9 +11442,9 @@ ], "description": "CustomerPage module", "support": { - "source": "https://github.com/spryker-shop/customer-page/tree/2.52.0" + "source": "https://github.com/spryker-shop/customer-page/tree/2.53.0" }, - "time": "2024-02-20T09:01:44+00:00" + "time": "2024-07-09T11:33:31+00:00" }, { "name": "spryker-shop/customer-page-extension", @@ -18233,31 +18242,34 @@ }, { "name": "spryker/agent-auth-rest-api", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/agent-auth-rest-api.git", - "reference": "9de75081cfc76b83e9dd08bf14899c8c484d66ca" + "reference": "f31cdd9cc7ad222f64a5018b4ea580cf9c628d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/agent-auth-rest-api/zipball/9de75081cfc76b83e9dd08bf14899c8c484d66ca", - "reference": "9de75081cfc76b83e9dd08bf14899c8c484d66ca", + "url": "https://api.github.com/repos/spryker/agent-auth-rest-api/zipball/f31cdd9cc7ad222f64a5018b4ea580cf9c628d46", + "reference": "f31cdd9cc7ad222f64a5018b4ea580cf9c628d46", "shasum": "" }, "require": { - "php": ">=7.2", + "php": ">=8.1", "spryker/agent": "^1.3.0", "spryker/auth-rest-api-extension": "^1.1.0", "spryker/glue-application": "^1.9.0", "spryker/glue-application-extension": "^1.0.0", "spryker/kernel": "^3.30.0", + "spryker/log": "^3.17.0", "spryker/oauth": "^2.0.0", "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.27.0", "spryker/util-encoding": "^2.0.0" }, "require-dev": { - "spryker/code-sniffer": "*" + "spryker/code-sniffer": "*", + "spryker/testify": "*" }, "type": "library", "extra": { @@ -18276,9 +18288,9 @@ ], "description": "AgentAuthRestApi module", "support": { - "source": "https://github.com/spryker/agent-auth-rest-api/tree/master" + "source": "https://github.com/spryker/agent-auth-rest-api/tree/1.1.0" }, - "time": "2020-08-18T17:06:30+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/agent-dashboard-merchant-portal-gui", @@ -18559,22 +18571,23 @@ }, { "name": "spryker/agent-security-merchant-portal-gui", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/agent-security-merchant-portal-gui.git", - "reference": "353e2ff855c70390a80347ce16cfc6609b0ef8b8" + "reference": "561666781f0d69a07b966c154476b165e8e95113" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/agent-security-merchant-portal-gui/zipball/353e2ff855c70390a80347ce16cfc6609b0ef8b8", - "reference": "353e2ff855c70390a80347ce16cfc6609b0ef8b8", + "url": "https://api.github.com/repos/spryker/agent-security-merchant-portal-gui/zipball/561666781f0d69a07b966c154476b165e8e95113", + "reference": "561666781f0d69a07b966c154476b165e8e95113", "shasum": "" }, "require": { "php": ">=8.1", "spryker/container": "^1.1.0", "spryker/kernel": "^3.30.0", + "spryker/log": "^3.17.0", "spryker/merchant-agent": "^1.0.0", "spryker/merchant-user": "^1.0.0", "spryker/messenger": "^3.0.0", @@ -18615,9 +18628,9 @@ ], "description": "AgentSecurityMerchantPortalGui module", "support": { - "source": "https://github.com/spryker/agent-security-merchant-portal-gui/tree/1.0.0" + "source": "https://github.com/spryker/agent-security-merchant-portal-gui/tree/1.1.0" }, - "time": "2024-04-03T13:26:42+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/alternative-products-rest-api", @@ -19148,26 +19161,28 @@ }, { "name": "spryker/auth-rest-api", - "version": "2.14.2", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/spryker/auth-rest-api.git", - "reference": "baa28e3503c13d215791883db349609699bf6857" + "reference": "e89598d4007b5a35f0d90f2e1ef19d7196a635fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/auth-rest-api/zipball/baa28e3503c13d215791883db349609699bf6857", - "reference": "baa28e3503c13d215791883db349609699bf6857", + "url": "https://api.github.com/repos/spryker/auth-rest-api/zipball/e89598d4007b5a35f0d90f2e1ef19d7196a635fb", + "reference": "e89598d4007b5a35f0d90f2e1ef19d7196a635fb", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", "spryker/auth-rest-api-extension": "^1.1.0", "spryker/glue-application": "^1.30.0", "spryker/glue-application-extension": "^1.4.0", "spryker/kernel": "^3.58.0", + "spryker/log": "^3.17.0", "spryker/oauth": "^1.9.0 || ^2.0.0", "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.27.0", "spryker/util-encoding": "^2.0.0", "spryker/zed-request": "^3.0.0" }, @@ -19202,9 +19217,9 @@ ], "description": "AuthRestApi module", "support": { - "source": "https://github.com/spryker/auth-rest-api/tree/2.14.2" + "source": "https://github.com/spryker/auth-rest-api/tree/2.15.0" }, - "time": "2023-03-31T19:36:11+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/auth-rest-api-extension", @@ -30273,16 +30288,16 @@ }, { "name": "spryker/customer", - "version": "7.56.2", + "version": "7.57.0", "source": { "type": "git", "url": "https://github.com/spryker/customer.git", - "reference": "e4c03261bdc2ae8401fdcedb60c48944081ec92a" + "reference": "98f224bc066ba2d4a2fa2b7d29e5096299bb2e2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/customer/zipball/e4c03261bdc2ae8401fdcedb60c48944081ec92a", - "reference": "e4c03261bdc2ae8401fdcedb60c48944081ec92a", + "url": "https://api.github.com/repos/spryker/customer/zipball/98f224bc066ba2d4a2fa2b7d29e5096299bb2e2e", + "reference": "98f224bc066ba2d4a2fa2b7d29e5096299bb2e2e", "shasum": "" }, "require": { @@ -30320,6 +30335,7 @@ "spryker/container": "*", "spryker/event-dispatcher": "*", "spryker/form": "*", + "spryker/log": "*", "spryker/sales": "*", "spryker/testify": "*", "spryker/twig": "*", @@ -30328,6 +30344,7 @@ }, "suggest": { "spryker/checkout": "If you want to use Checkout plugins.", + "spryker/log": "If you want to use Log plugins.", "spryker/sales": "If you want customer information in sales." }, "type": "library", @@ -30349,9 +30366,9 @@ ], "description": "Customer module", "support": { - "source": "https://github.com/spryker/customer/tree/7.56.2" + "source": "https://github.com/spryker/customer/tree/7.57.0" }, - "time": "2024-04-29T10:21:07+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/customer-access", @@ -35459,16 +35476,16 @@ }, { "name": "spryker/log", - "version": "3.16.0", + "version": "3.17.0", "source": { "type": "git", "url": "https://github.com/spryker/log.git", - "reference": "c4f42e40cdd637746f30a6ec5342ac1ffbf0a9f5" + "reference": "389ca0e0b1d5c4e7f5d998c35d8161833018e442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/log/zipball/c4f42e40cdd637746f30a6ec5342ac1ffbf0a9f5", - "reference": "c4f42e40cdd637746f30a6ec5342ac1ffbf0a9f5", + "url": "https://api.github.com/repos/spryker/log/zipball/389ca0e0b1d5c4e7f5d998c35d8161833018e442", + "reference": "389ca0e0b1d5c4e7f5d998c35d8161833018e442", "shasum": "" }, "require": { @@ -35477,10 +35494,11 @@ "spryker/config": "^3.0.0", "spryker/kernel": "^3.48.0", "spryker/locale": "^3.0.0 || ^4.0.0", + "spryker/log-extension": "^1.0.0", "spryker/monolog": "^2.0.0", "spryker/queue": "^0.3.0 || ^1.0.0", "spryker/symfony": "^3.0.0", - "spryker/transfer": "^3.25.0", + "spryker/transfer": "^3.27.0", "spryker/util-network": "^1.0.0" }, "require-dev": { @@ -35510,9 +35528,51 @@ ], "description": "Log module", "support": { - "source": "https://github.com/spryker/log/tree/3.16.0" + "source": "https://github.com/spryker/log/tree/3.17.0" }, - "time": "2023-11-02T20:09:27+00:00" + "time": "2024-07-09T11:33:28+00:00" + }, + { + "name": "spryker/log-extension", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/log-extension.git", + "reference": "c913c2fe050887fd3b833cfe1414c8de0b8b7c56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/log-extension/zipball/c913c2fe050887fd3b833cfe1414c8de0b8b7c56", + "reference": "c913c2fe050887fd3b833cfe1414c8de0b8b7c56", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "LogExtension module", + "support": { + "source": "https://github.com/spryker/log-extension/tree/1.0.0" + }, + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/mail", @@ -41406,16 +41466,16 @@ }, { "name": "spryker/oauth-backend-api", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/spryker/oauth-backend-api.git", - "reference": "10be473eef02d1ec4a398cf41070d54e55317713" + "reference": "e4f6259935dc4cf4583e19887a0006f47e8861bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/oauth-backend-api/zipball/10be473eef02d1ec4a398cf41070d54e55317713", - "reference": "10be473eef02d1ec4a398cf41070d54e55317713", + "url": "https://api.github.com/repos/spryker/oauth-backend-api/zipball/e4f6259935dc4cf4583e19887a0006f47e8861bc", + "reference": "e4f6259935dc4cf4583e19887a0006f47e8861bc", "shasum": "" }, "require": { @@ -41423,10 +41483,11 @@ "spryker/authentication": "^1.0.0", "spryker/glue-application-extension": "^1.10.0", "spryker/kernel": "^3.66.0", + "spryker/log": "^3.17.0", "spryker/oauth": "^2.4.0", "spryker/oauth-backend-api-extension": "^1.0.0", "spryker/symfony": "^3.5.0", - "spryker/transfer": "^3.25.0", + "spryker/transfer": "^3.27.0", "spryker/util-encoding": "^2.0.0" }, "require-dev": { @@ -41454,9 +41515,9 @@ ], "description": "OauthBackendApi module", "support": { - "source": "https://github.com/spryker/oauth-backend-api/tree/1.5.0" + "source": "https://github.com/spryker/oauth-backend-api/tree/1.6.0" }, - "time": "2023-12-07T13:36:13+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/oauth-backend-api-extension", @@ -55465,6 +55526,94 @@ }, "time": "2019-12-02T06:18:26+00:00" }, + { + "name": "spryker/rule-engine", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/rule-engine.git", + "reference": "7328a4a0aefe381cd15f92ce0f47f2deea9ba152" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/rule-engine/zipball/7328a4a0aefe381cd15f92ce0f47f2deea9ba152", + "reference": "7328a4a0aefe381cd15f92ce0f47f2deea9ba152", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/kernel": "^3.30.0", + "spryker/rule-engine-extension": "^1.0.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "RuleEngine module", + "support": { + "source": "https://github.com/spryker/rule-engine/tree/1.0.0" + }, + "time": "2024-07-10T09:00:59+00:00" + }, + { + "name": "spryker/rule-engine-extension", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/rule-engine-extension.git", + "reference": "c2a0769972de8173927e0580f9e2a04561981b4f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/rule-engine-extension/zipball/c2a0769972de8173927e0580f9e2a04561981b4f", + "reference": "c2a0769972de8173927e0580f9e2a04561981b4f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/kernel": "^3.30.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "RuleEngineExtension module", + "support": { + "source": "https://github.com/spryker/rule-engine-extension/tree/1.0.0" + }, + "time": "2024-06-24T13:52:12+00:00" + }, { "name": "spryker/sales", "version": "11.47.0", @@ -58478,21 +58627,22 @@ }, { "name": "spryker/security-gui", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/spryker/security-gui.git", - "reference": "bee29d901c596035d6a5b7001a02034c61c2a14e" + "reference": "3299f3f4ac739a65ff50ea40ab59126d0be16bb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/security-gui/zipball/bee29d901c596035d6a5b7001a02034c61c2a14e", - "reference": "bee29d901c596035d6a5b7001a02034c61c2a14e", + "url": "https://api.github.com/repos/spryker/security-gui/zipball/3299f3f4ac739a65ff50ea40ab59126d0be16bb9", + "reference": "3299f3f4ac739a65ff50ea40ab59126d0be16bb9", "shasum": "" }, "require": { "php": ">=8.1", "spryker/kernel": "^3.30.0", + "spryker/log": "^3.17.0", "spryker/messenger": "^3.0.0", "spryker/security": "^1.8.0", "spryker/security-blocker": "^1.0.0", @@ -58536,9 +58686,9 @@ ], "description": "SecurityGui module", "support": { - "source": "https://github.com/spryker/security-gui/tree/1.6.0" + "source": "https://github.com/spryker/security-gui/tree/1.7.0" }, - "time": "2023-12-21T16:51:01+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/security-gui-extension", @@ -58583,22 +58733,23 @@ }, { "name": "spryker/security-merchant-portal-gui", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/spryker/security-merchant-portal-gui.git", - "reference": "3b644e04df763b57e6ed80e51f8d3234593dbc1c" + "reference": "292a8cad582cc5125144f266134364de494bb27d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/security-merchant-portal-gui/zipball/3b644e04df763b57e6ed80e51f8d3234593dbc1c", - "reference": "3b644e04df763b57e6ed80e51f8d3234593dbc1c", + "url": "https://api.github.com/repos/spryker/security-merchant-portal-gui/zipball/292a8cad582cc5125144f266134364de494bb27d", + "reference": "292a8cad582cc5125144f266134364de494bb27d", "shasum": "" }, "require": { "php": ">=8.1", "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/kernel": "^3.33.0", + "spryker/log": "^3.17.0", "spryker/merchant-user": "^1.0.0", "spryker/messenger": "^3.0.0", "spryker/security": "^1.8.0", @@ -58606,7 +58757,7 @@ "spryker/security-extension": "^1.0.0", "spryker/security-merchant-portal-gui-extension": "^1.1.0", "spryker/symfony": "^3.5.0", - "spryker/transfer": "^3.25.0", + "spryker/transfer": "^3.27.0", "spryker/user-merchant-portal-gui-extension": "^1.0.0", "spryker/zed-ui": "^3.0.0" }, @@ -58643,9 +58794,9 @@ ], "description": "SecurityMerchantPortalGui module", "support": { - "source": "https://github.com/spryker/security-merchant-portal-gui/tree/3.0.0" + "source": "https://github.com/spryker/security-merchant-portal-gui/tree/3.1.0" }, - "time": "2024-04-03T13:26:42+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/security-merchant-portal-gui-extension", @@ -61688,25 +61839,124 @@ "time": "2024-03-21T18:45:02+00:00" }, { - "name": "spryker/store-context-gui", + "name": "spryker/store-context", "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/store-context.git", + "reference": "80d8de9dc363aec878b5efa45504c6687b908181" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/store-context/zipball/80d8de9dc363aec878b5efa45504c6687b908181", + "reference": "80d8de9dc363aec878b5efa45504c6687b908181", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/kernel": "^3.30.0", + "spryker/store": "^1.25.0", + "spryker/store-extension": "^1.0.0", + "spryker/transfer": "^3.27.0", + "spryker/util-encoding": "^2.0.0" + }, + "require-dev": { + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/container": "*", + "spryker/propel": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "StoreContext module", + "support": { + "source": "https://github.com/spryker/store-context/tree/1.0.0" + }, + "time": "2024-06-18T09:53:39+00:00" + }, + { + "name": "spryker/store-context-data-import", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/store-context-data-import.git", + "reference": "719c09852e53074ebd96f3b993b36e77c94fbffa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/store-context-data-import/zipball/719c09852e53074ebd96f3b993b36e77c94fbffa", + "reference": "719c09852e53074ebd96f3b993b36e77c94fbffa", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/data-import": "^1.0.0", + "spryker/kernel": "^3.33.0", + "spryker/store": "^1.19.0", + "spryker/store-context": "^1.0.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/propel": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "StoreContextDataImport module", + "support": { + "source": "https://github.com/spryker/store-context-data-import/tree/0.1.0" + }, + "time": "2024-06-18T09:53:39+00:00" + }, + { + "name": "spryker/store-context-gui", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/spryker/store-context-gui.git", - "reference": "f416882c1b3a79b63281a195ad721959ef6695ab" + "reference": "1dacbec8ac2e50b7cde5c5b4f6837c8abe7a1429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/store-context-gui/zipball/f416882c1b3a79b63281a195ad721959ef6695ab", - "reference": "f416882c1b3a79b63281a195ad721959ef6695ab", + "url": "https://api.github.com/repos/spryker/store-context-gui/zipball/1dacbec8ac2e50b7cde5c5b4f6837c8abe7a1429", + "reference": "1dacbec8ac2e50b7cde5c5b4f6837c8abe7a1429", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", "spryker/gui": "^3.45.0", "spryker/kernel": "^3.71.0", + "spryker/store-context": "^1.0.0", "spryker/store-gui-extension": "^1.0.0", - "spryker/symfony": "^3.11.0" + "spryker/symfony": "^3.11.0", + "spryker/transfer": "^3.27.0" }, "require-dev": { "spryker/code-sniffer": "*" @@ -61714,7 +61964,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -61728,9 +61978,61 @@ ], "description": "StoreContextGui module", "support": { - "source": "https://github.com/spryker/store-context-gui/tree/1.0.0" + "source": "https://github.com/spryker/store-context-gui/tree/2.0.0" }, - "time": "2023-03-31T19:36:11+00:00" + "time": "2024-06-18T09:53:39+00:00" + }, + { + "name": "spryker/store-context-storage", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/store-context-storage.git", + "reference": "239c461ae03c02bc8753387c2d4f8156f29cc257" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/store-context-storage/zipball/239c461ae03c02bc8753387c2d4f8156f29cc257", + "reference": "239c461ae03c02bc8753387c2d4f8156f29cc257", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/event-behavior": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/publisher-extension": "^1.0.0", + "spryker/store-extension": "^1.0.0", + "spryker/store-storage": "^1.0.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/propel": "*", + "spryker/queue": "*", + "spryker/store": "*", + "spryker/store-context": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "StoreContextStorage module", + "support": { + "source": "https://github.com/spryker/store-context-storage/tree/1.0.0" + }, + "time": "2024-06-18T09:53:39+00:00" }, { "name": "spryker/store-data-import", @@ -63467,16 +63769,16 @@ }, { "name": "spryker/user", - "version": "3.21.1", + "version": "3.23.0", "source": { "type": "git", "url": "https://github.com/spryker/user.git", - "reference": "775447da2cbef212f8ce56076c87d57882ffa571" + "reference": "c0d2ec8d81831f1873ccff4856e5385b67087f22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/user/zipball/775447da2cbef212f8ce56076c87d57882ffa571", - "reference": "775447da2cbef212f8ce56076c87d57882ffa571", + "url": "https://api.github.com/repos/spryker/user/zipball/c0d2ec8d81831f1873ccff4856e5385b67087f22", + "reference": "c0d2ec8d81831f1873ccff4856e5385b67087f22", "shasum": "" }, "require": { @@ -63500,6 +63802,7 @@ "spryker/event-dispatcher": "*", "spryker/form": "*", "spryker/installer": "*", + "spryker/log": "*", "spryker/propel": "*", "spryker/router": "*", "spryker/security": "*", @@ -63512,6 +63815,7 @@ }, "suggest": { "spryker/installer": "If you want to use Installer plugin.", + "spryker/log": "If you want to use Log plugins.", "spryker/silex": "If you want to use ServiceProvider.", "spryker/twig": "Use this module when using plugins that need Twig dependencies." }, @@ -63533,9 +63837,9 @@ ], "description": "User module", "support": { - "source": "https://github.com/spryker/user/tree/3.21.1" + "source": "https://github.com/spryker/user/tree/3.23.0" }, - "time": "2024-03-13T15:14:46+00:00" + "time": "2024-07-09T11:33:28+00:00" }, { "name": "spryker/user-extension", @@ -76900,6 +77204,12 @@ } ], "aliases": [ + { + "package": "spryker-feature/agent-assist", + "version": "9999999-dev", + "alias": "202407.0", + "alias_normalized": "202407.0" + }, { "package": "spryker-feature/cart", "version": "9999999-dev", @@ -76983,10 +77293,17 @@ "version": "9999999-dev", "alias": "202407.0", "alias_normalized": "202407.0" + }, + { + "package": "spryker-feature/spryker-core-back-office", + "version": "9999999-dev", + "alias": "202407.0", + "alias_normalized": "202407.0" } ], "minimum-stability": "dev", "stability-flags": { + "spryker-feature/agent-assist": 20, "spryker-feature/cart": 20, "spryker-feature/comments": 20, "spryker-feature/configurable-bundle": 20, @@ -77001,6 +77318,7 @@ "spryker-feature/promotions-discounts": 20, "spryker-feature/shopping-lists": 20, "spryker-feature/spryker-core": 20, + "spryker-feature/spryker-core-back-office": 20, "spryker/cypress-tests": 20, "spryker/docker-chromedriver": 20, "spryker/robotframework-suite-tests": 20 From faf05b9c5a961aa85bb485ab61d3fa862a17f5d0 Mon Sep 17 00:00:00 2001 From: ilyakubanov Date: Thu, 11 Jul 2024 17:22:55 +0200 Subject: [PATCH 2/4] Integration --- config/Shared/config_default.php | 24 ++++++++++ src/Pyz/Glue/Log/LogDependencyProvider.php | 54 +++++++++++++++++++++ src/Pyz/Yves/Log/LogDependencyProvider.php | 32 +++++++++++++ src/Pyz/Zed/Log/LogDependencyProvider.php | 56 ++++++++++++++++++++++ 4 files changed, 166 insertions(+) diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 484bb1023..6c7ac5896 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -36,6 +36,8 @@ use Pyz\Zed\Application\Communication\ZedBootstrap; use Spryker\Client\RabbitMq\Model\RabbitMqAdapter; use Spryker\Glue\Log\Plugin\GlueLoggerConfigPlugin; +use Spryker\Glue\Log\Plugin\Log\GlueBackendSecurityAuditLoggerConfigPlugin; +use Spryker\Glue\Log\Plugin\Log\GlueSecurityAuditLoggerConfigPlugin; use Spryker\Service\FlysystemLocalFileSystem\Plugin\Flysystem\LocalFilesystemBuilderPlugin; use Spryker\Shared\Acl\AclConstants; use Spryker\Shared\Agent\AgentConstants; @@ -116,7 +118,10 @@ use Spryker\Shared\Translator\TranslatorConstants; use Spryker\Shared\User\UserConstants; use Spryker\Shared\ZedRequest\ZedRequestConstants; +use Spryker\Yves\Log\Plugin\Log\YvesSecurityAuditLoggerConfigPlugin; use Spryker\Yves\Log\Plugin\YvesLoggerConfigPlugin; +use Spryker\Zed\Log\Communication\Plugin\Log\MerchantPortalSecurityAuditLoggerConfigPlugin; +use Spryker\Zed\Log\Communication\Plugin\Log\ZedSecurityAuditLoggerConfigPlugin; use Spryker\Zed\Log\Communication\Plugin\ZedLoggerConfigPlugin; use Spryker\Zed\MessageBrokerAws\MessageBrokerAwsConfig; use Spryker\Zed\OauthAuth0\OauthAuth0Config; @@ -239,6 +244,9 @@ $config[LogConstants::LOG_SANITIZE_FIELDS] = [ 'password', ]; +$config[LogConstants::AUDIT_LOG_SANITIZE_FIELDS] = [ + 'password', +]; // ---------------------------------------------------------------------------- // ------------------------------ AUTHENTICATION ------------------------------ @@ -474,6 +482,22 @@ $config[LogConstants::LOGGER_CONFIG_YVES] = YvesLoggerConfigPlugin::class; $config[LogConstants::LOGGER_CONFIG_GLUE] = GlueLoggerConfigPlugin::class; +$config[LogConstants::AUDIT_LOGGER_CONFIG_PLUGINS_YVES] = [ + YvesSecurityAuditLoggerConfigPlugin::class, +]; +$config[LogConstants::AUDIT_LOGGER_CONFIG_PLUGINS_ZED] = [ + ZedSecurityAuditLoggerConfigPlugin::class, +]; +$config[LogConstants::AUDIT_LOGGER_CONFIG_PLUGINS_GLUE] = [ + GlueSecurityAuditLoggerConfigPlugin::class, +]; +$config[LogConstants::AUDIT_LOGGER_CONFIG_PLUGINS_GLUE_BACKEND] = [ + GlueBackendSecurityAuditLoggerConfigPlugin::class, +]; +$config[LogConstants::AUDIT_LOGGER_CONFIG_PLUGINS_MERCHANT_PORTAL] = [ + MerchantPortalSecurityAuditLoggerConfigPlugin::class, +]; + $config[LogConstants::LOG_QUEUE_NAME] = 'log-queue'; $config[LogConstants::LOG_ERROR_QUEUE_NAME] = 'error-log-queue'; diff --git a/src/Pyz/Glue/Log/LogDependencyProvider.php b/src/Pyz/Glue/Log/LogDependencyProvider.php index 9fa7d956a..f096a8926 100644 --- a/src/Pyz/Glue/Log/LogDependencyProvider.php +++ b/src/Pyz/Glue/Log/LogDependencyProvider.php @@ -10,6 +10,9 @@ use Spryker\Glue\Log\LogDependencyProvider as SprykerLogDependencyProvider; use Spryker\Glue\Log\Plugin\Handler\ExceptionStreamHandlerPlugin; use Spryker\Glue\Log\Plugin\Handler\StreamHandlerPlugin; +use Spryker\Glue\Log\Plugin\Log\AuditLogMetaDataProcessorPlugin; +use Spryker\Glue\Log\Plugin\Log\AuditLogRequestProcessorPlugin; +use Spryker\Glue\Log\Plugin\Log\AuditLogTagFilterBufferedStreamHandlerPlugin; use Spryker\Glue\Log\Plugin\Processor\EnvironmentProcessorPlugin; use Spryker\Glue\Log\Plugin\Processor\GuzzleBodyProcessorPlugin; use Spryker\Glue\Log\Plugin\Processor\PsrLogMessageProcessorPlugin; @@ -30,6 +33,26 @@ protected function getLogHandlers(): array ]; } + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogHandlerPluginInterface> + */ + protected function getGlueSecurityAuditLogHandlerPlugins(): array + { + return [ + new AuditLogTagFilterBufferedStreamHandlerPlugin(), + ]; + } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogHandlerPluginInterface> + */ + protected function getGlueBackendSecurityAuditLogHandlerPlugins(): array + { + return [ + new AuditLogTagFilterBufferedStreamHandlerPlugin(), + ]; + } + /** * @return array<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> */ @@ -44,4 +67,35 @@ protected function getProcessors(): array new GuzzleBodyProcessorPlugin(), ]; } + + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> + */ + protected function getGlueSecurityAuditLogProcessorPlugins(): array + { + return [ + new PsrLogMessageProcessorPlugin(), + new EnvironmentProcessorPlugin(), + new ServerProcessorPlugin(), + new AuditLogRequestProcessorPlugin(), + new ResponseProcessorPlugin(), + new AuditLogMetaDataProcessorPlugin(), + ]; + } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> + */ + protected function getGlueBackendSecurityAuditLogProcessorPlugins(): array + { + return [ + new PsrLogMessageProcessorPlugin(), + new EnvironmentProcessorPlugin(), + new ServerProcessorPlugin(), + new AuditLogRequestProcessorPlugin(), + new ResponseProcessorPlugin(), + new AuditLogMetaDataProcessorPlugin(), + ]; + } } diff --git a/src/Pyz/Yves/Log/LogDependencyProvider.php b/src/Pyz/Yves/Log/LogDependencyProvider.php index 2929662d8..60647b944 100644 --- a/src/Pyz/Yves/Log/LogDependencyProvider.php +++ b/src/Pyz/Yves/Log/LogDependencyProvider.php @@ -7,15 +7,20 @@ namespace Pyz\Yves\Log; +use Spryker\Yves\Customer\Plugin\Log\CurrentCustomerDataRequestProcessorPlugin; use Spryker\Yves\Log\LogDependencyProvider as SprykerLogDependencyProvider; use Spryker\Yves\Log\Plugin\Handler\ExceptionStreamHandlerPlugin; use Spryker\Yves\Log\Plugin\Handler\StreamHandlerPlugin; +use Spryker\Yves\Log\Plugin\Log\AuditLogMetaDataProcessorPlugin; +use Spryker\Yves\Log\Plugin\Log\AuditLogRequestProcessorPlugin; +use Spryker\Yves\Log\Plugin\Log\AuditLogTagFilterBufferedStreamHandlerPlugin; use Spryker\Yves\Log\Plugin\Processor\EnvironmentProcessorPlugin; use Spryker\Yves\Log\Plugin\Processor\GuzzleBodyProcessorPlugin; use Spryker\Yves\Log\Plugin\Processor\PsrLogMessageProcessorPlugin; use Spryker\Yves\Log\Plugin\Processor\RequestProcessorPlugin; use Spryker\Yves\Log\Plugin\Processor\ResponseProcessorPlugin; use Spryker\Yves\Log\Plugin\Processor\ServerProcessorPlugin; +use SprykerShop\Yves\AgentPage\Plugin\Log\AgentCurrentRequestProcessorPlugin; class LogDependencyProvider extends SprykerLogDependencyProvider { @@ -30,6 +35,16 @@ protected function getLogHandlers(): array ]; } + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogHandlerPluginInterface> + */ + protected function getYvesSecurityAuditLogHandlerPlugins(): array + { + return [ + new AuditLogTagFilterBufferedStreamHandlerPlugin(), + ]; + } + /** * @return array<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> */ @@ -44,4 +59,21 @@ protected function getProcessors(): array new GuzzleBodyProcessorPlugin(), ]; } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> + */ + protected function getYvesSecurityAuditLogProcessorPlugins(): array + { + return [ + new PsrLogMessageProcessorPlugin(), + new EnvironmentProcessorPlugin(), + new ServerProcessorPlugin(), + new AuditLogRequestProcessorPlugin(), + new CurrentCustomerDataRequestProcessorPlugin(), + new ResponseProcessorPlugin(), + new AuditLogMetaDataProcessorPlugin(), + new AgentCurrentRequestProcessorPlugin(), + ]; + } } diff --git a/src/Pyz/Zed/Log/LogDependencyProvider.php b/src/Pyz/Zed/Log/LogDependencyProvider.php index 94fb81e62..8ff4fbac8 100644 --- a/src/Pyz/Zed/Log/LogDependencyProvider.php +++ b/src/Pyz/Zed/Log/LogDependencyProvider.php @@ -9,6 +9,9 @@ use Spryker\Zed\Log\Communication\Plugin\Handler\ExceptionStreamHandlerPlugin; use Spryker\Zed\Log\Communication\Plugin\Handler\StreamHandlerPlugin; +use Spryker\Zed\Log\Communication\Plugin\Log\AuditLogMetaDataProcessorPlugin; +use Spryker\Zed\Log\Communication\Plugin\Log\AuditLogRequestProcessorPlugin; +use Spryker\Zed\Log\Communication\Plugin\Log\AuditLogTagFilterBufferedStreamHandlerPlugin; use Spryker\Zed\Log\Communication\Plugin\Processor\EnvironmentProcessorPlugin; use Spryker\Zed\Log\Communication\Plugin\Processor\GuzzleBodyProcessorPlugin; use Spryker\Zed\Log\Communication\Plugin\Processor\PsrLogMessageProcessorPlugin; @@ -17,6 +20,7 @@ use Spryker\Zed\Log\Communication\Plugin\Processor\ServerProcessorPlugin; use Spryker\Zed\Log\LogDependencyProvider as SprykerLogDependencyProvider; use Spryker\Zed\Propel\Communication\Plugin\Log\EntityProcessorPlugin; +use Spryker\Zed\User\Communication\Plugin\Log\CurrentUserDataRequestProcessorPlugin; class LogDependencyProvider extends SprykerLogDependencyProvider { @@ -31,6 +35,26 @@ protected function getLogHandlers(): array ]; } + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogHandlerPluginInterface> + */ + protected function getZedSecurityAuditLogHandlerPlugins(): array + { + return [ + new AuditLogTagFilterBufferedStreamHandlerPlugin(), + ]; + } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogHandlerPluginInterface> + */ + protected function getMerchantPortalSecurityAuditLogHandlerPlugins(): array + { + return [ + new AuditLogTagFilterBufferedStreamHandlerPlugin(), + ]; + } + /** * @return array<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> */ @@ -46,4 +70,36 @@ protected function getLogProcessors(): array new GuzzleBodyProcessorPlugin(), ]; } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> + */ + protected function getZedSecurityAuditLogProcessorPlugins(): array + { + return [ + new PsrLogMessageProcessorPlugin(), + new EnvironmentProcessorPlugin(), + new ServerProcessorPlugin(), + new AuditLogRequestProcessorPlugin(), + new CurrentUserDataRequestProcessorPlugin(), + new ResponseProcessorPlugin(), + new AuditLogMetaDataProcessorPlugin(), + ]; + } + + /** + * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> + */ + protected function getMerchantPortalSecurityAuditLogProcessorPlugins(): array + { + return [ + new PsrLogMessageProcessorPlugin(), + new EnvironmentProcessorPlugin(), + new ServerProcessorPlugin(), + new AuditLogRequestProcessorPlugin(), + new CurrentUserDataRequestProcessorPlugin(), + new ResponseProcessorPlugin(), + new AuditLogMetaDataProcessorPlugin(), + ]; + } } From c50cf9f2e5178fb44f961a8ca7c4ca213632361a Mon Sep 17 00:00:00 2001 From: ilyakubanov Date: Thu, 11 Jul 2024 17:23:34 +0200 Subject: [PATCH 3/4] fixed ci --- .../Persistence/SpyStoreContext.php | 23 +++++++++++++++++++ .../Persistence/SpyStoreContextQuery.php | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/Orm/Zed/StoreContext/Persistence/SpyStoreContext.php create mode 100644 src/Orm/Zed/StoreContext/Persistence/SpyStoreContextQuery.php diff --git a/src/Orm/Zed/StoreContext/Persistence/SpyStoreContext.php b/src/Orm/Zed/StoreContext/Persistence/SpyStoreContext.php new file mode 100644 index 000000000..f607ad809 --- /dev/null +++ b/src/Orm/Zed/StoreContext/Persistence/SpyStoreContext.php @@ -0,0 +1,23 @@ + Date: Thu, 11 Jul 2024 17:38:33 +0200 Subject: [PATCH 4/4] fixed ci --- src/Pyz/Glue/Log/LogDependencyProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pyz/Glue/Log/LogDependencyProvider.php b/src/Pyz/Glue/Log/LogDependencyProvider.php index f096a8926..558996ffd 100644 --- a/src/Pyz/Glue/Log/LogDependencyProvider.php +++ b/src/Pyz/Glue/Log/LogDependencyProvider.php @@ -68,7 +68,6 @@ protected function getProcessors(): array ]; } - /** * @return list<\Spryker\Shared\Log\Dependency\Plugin\LogProcessorPluginInterface> */